chore(nix): drop flake-parts
The primary goals here include making the flake easier to contribute to by having it follow the standard boilerplate, while also limiting the size of our flake.lock to lower the chance of duplicate inputs for users Signed-off-by: seth <getchoo@tuta.io>
This commit is contained in:
@@ -44,11 +44,14 @@ Example:
|
||||
# Optional: Override the nixpkgs input of prismlauncher to use the same revision as the rest of your flake
|
||||
# Note that overriding any input of prismlauncher may break reproducibility
|
||||
# inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
# This is not required for Flakes
|
||||
inputs.flake-compat.follows = "";
|
||||
};
|
||||
};
|
||||
|
||||
outputs =
|
||||
{ nixpkgs, prismlauncher }:
|
||||
{ nixpkgs, prismlauncher, ... }:
|
||||
{
|
||||
nixosConfigurations.foo = nixpkgs.lib.nixosSystem {
|
||||
modules = [
|
||||
@@ -85,11 +88,14 @@ Example:
|
||||
# Optional: Override the nixpkgs input of prismlauncher to use the same revision as the rest of your flake
|
||||
# Note that overriding any input of prismlauncher may break reproducibility
|
||||
# inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
# This is not required for Flakes
|
||||
inputs.flake-compat.follows = "";
|
||||
};
|
||||
};
|
||||
|
||||
outputs =
|
||||
{ nixpkgs, prismlauncher }:
|
||||
{ nixpkgs, prismlauncher, ... }:
|
||||
{
|
||||
nixosConfigurations.foo = nixpkgs.lib.nixosSystem {
|
||||
modules = [
|
||||
|
||||
15
nix/dev.nix
15
nix/dev.nix
@@ -1,15 +0,0 @@
|
||||
{
|
||||
perSystem =
|
||||
{ pkgs, self', ... }:
|
||||
{
|
||||
devShells.default = pkgs.mkShell {
|
||||
inputsFrom = [ self'.packages.prismlauncher-unwrapped ];
|
||||
buildInputs = with pkgs; [
|
||||
ccache
|
||||
ninja
|
||||
];
|
||||
};
|
||||
|
||||
formatter = pkgs.nixfmt-rfc-style;
|
||||
};
|
||||
}
|
||||
@@ -1,31 +0,0 @@
|
||||
{ inputs, self, ... }:
|
||||
{
|
||||
perSystem =
|
||||
{ lib, pkgs, ... }:
|
||||
{
|
||||
packages =
|
||||
let
|
||||
ourPackages = lib.makeScope pkgs.newScope (final: self.overlays.default final pkgs);
|
||||
in
|
||||
{
|
||||
inherit (ourPackages) prismlauncher-unwrapped prismlauncher;
|
||||
default = ourPackages.prismlauncher;
|
||||
};
|
||||
};
|
||||
|
||||
flake = {
|
||||
overlays.default =
|
||||
final: prev:
|
||||
let
|
||||
version = builtins.substring 0 8 self.lastModifiedDate or "dirty";
|
||||
in
|
||||
{
|
||||
prismlauncher-unwrapped = prev.callPackage ./pkg {
|
||||
inherit (inputs) libnbtplusplus;
|
||||
inherit version;
|
||||
};
|
||||
|
||||
prismlauncher = final.callPackage ./pkg/wrapper.nix { };
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -28,9 +28,9 @@ stdenv.mkDerivation {
|
||||
inherit version;
|
||||
|
||||
src = lib.fileset.toSource {
|
||||
root = ../../.;
|
||||
root = ../.;
|
||||
fileset = lib.fileset.unions (
|
||||
map (fileName: ../../${fileName}) [
|
||||
map (fileName: ../${fileName}) [
|
||||
"buildconfig"
|
||||
"cmake"
|
||||
"launcher"
|
||||
Reference in New Issue
Block a user