Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-04-29 22:24:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
After extensive (5 minutes) of testing, it seems we don't actually come
across any Nix bugs with lib.fileset! (aside from those inherit to
it...but 🤷)

This reverts commit a49a58bc4571f87f42f45bb9eeb1a957d5d12331.

Signed-off-by: Seth Flynn <getchoo@tuta.io>
This commit is contained in:
Seth Flynn 2025-03-30 16:41:19 -04:00
parent 0709479110
commit 99852c972c
No known key found for this signature in database
GPG Key ID: D31BD0D494BBEE86
3 changed files with 11 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
flake.lock generated
View File

@ -32,21 +32,6 @@
"type": "github" "type": "github"
} }
}, },
"nix-filter": {
"locked": {
"lastModified": 1731533336,
"narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=",
"owner": "numtide",
"repo": "nix-filter",
"rev": "f7653272fd234696ae94229839a99b73c9ab7de0",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "nix-filter",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1743095683, "lastModified": 1743095683,
@ -67,7 +52,6 @@
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"libnbtplusplus": "libnbtplusplus", "libnbtplusplus": "libnbtplusplus",
"nix-filter": "nix-filter",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
} }
} }

4
flake.nix
View File

@ -16,8 +16,6 @@
flake = false; flake = false;
}; };
nix-filter.url = "github:numtide/nix-filter";
/* /*
Inputs below this are optional and can be removed Inputs below this are optional and can be removed
@ -44,7 +42,6 @@
self, self,
nixpkgs, nixpkgs,
libnbtplusplus, libnbtplusplus,
nix-filter,
... ...
}: }:
let let
@ -100,7 +97,6 @@
prismlauncher-unwrapped = prev.callPackage ./nix/unwrapped.nix { prismlauncher-unwrapped = prev.callPackage ./nix/unwrapped.nix {
inherit inherit
libnbtplusplus libnbtplusplus
nix-filter
self self
; ;
}; };

22
nix/unwrapped.nix
View File

@ -11,7 +11,6 @@
kdePackages, kdePackages,
libnbtplusplus, libnbtplusplus,
ninja, ninja,
nix-filter,
self, self,
stripJavaArchivesHook, stripJavaArchivesHook,
tomlplusplus, tomlplusplus,
@ -29,17 +28,18 @@ stdenv.mkDerivation {
pname = "prismlauncher-unwrapped"; pname = "prismlauncher-unwrapped";
version = self.shortRev or self.dirtyShortRev or "unknown"; version = self.shortRev or self.dirtyShortRev or "unknown";
src = nix-filter.lib { src = lib.fileset.toSource {
root = self; root = ../.;
include = [ fileset = lib.fileset.unions [
"buildconfig"
"cmake"
"launcher"
"libraries"
"program_info"
"tests"
../COPYING.md
../CMakeLists.txt ../CMakeLists.txt
../COPYING.md
../buildconfig
../cmake
../launcher
../libraries
../program_info
../tests
]; ];
}; };