Revert "refactor(nix): nix-filter -> lib.fileset"

This reverts commit 8312713dc2.

See nix#9428. Path coercion like `"${./.}"` in flakes causes the path to
be copied to the store twice; using the `self` argument works around
this. However, as `lib.fileset` doesn't support using `self`, so we need
to go back to `nix-filter`

Signed-off-by: seth <getchoo@tuta.io>
This commit is contained in:
seth
2024-08-21 03:42:40 -04:00
parent 13eedbb7de
commit a49a58bc45
3 changed files with 41 additions and 15 deletions

View File

@@ -14,6 +14,8 @@
flake = false;
};
nix-filter.url = "github:numtide/nix-filter";
/*
Inputs below this are optional and can be removed
@@ -40,6 +42,7 @@
self,
nixpkgs,
libnbtplusplus,
nix-filter,
...
}:
let
@@ -86,7 +89,14 @@
version = builtins.substring 0 8 self.lastModifiedDate or "dirty";
in
{
prismlauncher-unwrapped = prev.callPackage ./nix/unwrapped.nix { inherit libnbtplusplus version; };
prismlauncher-unwrapped = prev.callPackage ./nix/unwrapped.nix {
inherit
libnbtplusplus
nix-filter
self
version
;
};
prismlauncher = final.callPackage ./nix/wrapper.nix { };
};