diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-05-16 14:42:10 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-05-16 16:13:10 +0000 |
| commit | 541bdd67bf406e9d54e36401fb85b08f8c6abba9 (patch) | |
| tree | 728ec2a0a8869d3babac75f6028f962aa7e9d09a /vm | |
| parent | a9c192e00d17548f75e18465baf359813bc05e72 (diff) | |
| download | spectrum-541bdd67bf406e9d54e36401fb85b08f8c6abba9.tar spectrum-541bdd67bf406e9d54e36401fb85b08f8c6abba9.tar.gz spectrum-541bdd67bf406e9d54e36401fb85b08f8c6abba9.tar.bz2 spectrum-541bdd67bf406e9d54e36401fb85b08f8c6abba9.tar.lz spectrum-541bdd67bf406e9d54e36401fb85b08f8c6abba9.tar.xz spectrum-541bdd67bf406e9d54e36401fb85b08f8c6abba9.tar.zst spectrum-541bdd67bf406e9d54e36401fb85b08f8c6abba9.zip | |
Remove Nix files in copyPathToStore
Nix files shouldn't be considered part of the sources, and so they should be filtered out. This way, changes to them (that don't change their meaning) won't force rebuilds.
Diffstat (limited to 'vm')
| -rw-r--r-- | vm/app/catgirl/default.nix | 6 | ||||
| -rw-r--r-- | vm/app/lynx/default.nix | 6 | ||||
| -rw-r--r-- | vm/sys/net/default.nix | 6 |
3 files changed, 12 insertions, 6 deletions
diff --git a/vm/app/catgirl/default.nix b/vm/app/catgirl/default.nix index 4e700f8..2b27710 100644 --- a/vm/app/catgirl/default.nix +++ b/vm/app/catgirl/default.nix @@ -13,7 +13,7 @@ pkgs.pkgsStatic.callPackage ( }: let - inherit (lib) cleanSource cleanSourceWith concatMapStringsSep; + inherit (lib) cleanSource cleanSourceWith concatMapStringsSep hasSuffix; packages = [ catgirl execline kmod mdevd s6 s6-linux-init s6-rc @@ -65,7 +65,9 @@ stdenv.mkDerivation { name = "spectrum-appvm-catgirl"; src = cleanSourceWith { - filter = name: _type: name != "${toString ./.}/build"; + filter = name: _type: + name != "${toString ./.}/build" && + !(hasSuffix ".nix" name); src = cleanSource ./.; }; diff --git a/vm/app/lynx/default.nix b/vm/app/lynx/default.nix index 0d8a629..098146b 100644 --- a/vm/app/lynx/default.nix +++ b/vm/app/lynx/default.nix @@ -13,7 +13,7 @@ pkgs.pkgsStatic.callPackage ( }: let - inherit (lib) cleanSource cleanSourceWith concatMapStringsSep; + inherit (lib) cleanSource cleanSourceWith concatMapStringsSep hasSuffix; packages = [ execline kmod lynx mdevd s6 s6-linux-init s6-rc @@ -65,7 +65,9 @@ stdenv.mkDerivation { name = "spectrum-appvm-lynx"; src = cleanSourceWith { - filter = name: _type: name != "${toString ./.}/build"; + filter = name: _type: + name != "${toString ./.}/build" && + !(hasSuffix ".nix" name); src = cleanSource ./.; }; diff --git a/vm/sys/net/default.nix b/vm/sys/net/default.nix index f145a2c..6f4e24d 100644 --- a/vm/sys/net/default.nix +++ b/vm/sys/net/default.nix @@ -14,7 +14,7 @@ pkgs.pkgsStatic.callPackage ( }: let - inherit (lib) cleanSource cleanSourceWith concatMapStringsSep; + inherit (lib) cleanSource cleanSourceWith concatMapStringsSep hasSuffix; connman = connmanMinimal; @@ -74,7 +74,9 @@ stdenv.mkDerivation { name = "spectrum-netvm"; src = cleanSourceWith { - filter = name: _type: name != "${toString ./.}/build"; + filter = name: _type: + name != "${toString ./.}/build" && + !(hasSuffix ".nix" name); src = cleanSource ./.; }; |