Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-06-12 05:07:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

28
nix/unwrapped.nix
View File

@ -10,6 +10,8 @@
jdk17,
kdePackages,
ninja,
nix-filter,
self,
stripJavaArchivesHook,
tomlplusplus,
zlib,
@ -27,20 +29,18 @@ stdenv.mkDerivation {
pname = "prismlauncher-unwrapped";
inherit version;
src = lib.fileset.toSource {
root = ../.;
fileset = lib.fileset.unions (
map (fileName: ../${fileName}) [
"buildconfig"
"cmake"
"launcher"
"libraries"
"program_info"
"tests"
"COPYING.md"
"CMakeLists.txt"
]
);
src = nix-filter.lib {
root = self;
include = [
"buildconfig"
"cmake"
"launcher"
"libraries"
"program_info"
"tests"
../COPYING.md
../CMakeLists.txt
];
};
postUnpack = ''