diff options
Diffstat (limited to 'corepkgs')
| -rw-r--r-- | corepkgs/local.mk | 2 | ||||
| -rw-r--r-- | corepkgs/nar.nix | 48 |
2 files changed, 1 insertions, 49 deletions
diff --git a/corepkgs/local.mk b/corepkgs/local.mk index 8ea66a7c3..362c8eb61 100644 --- a/corepkgs/local.mk +++ b/corepkgs/local.mk @@ -1,4 +1,4 @@ -corepkgs_FILES = nar.nix buildenv.nix unpack-channel.nix derivation.nix fetchurl.nix imported-drv-to-derivation.nix +corepkgs_FILES = buildenv.nix unpack-channel.nix derivation.nix fetchurl.nix imported-drv-to-derivation.nix $(foreach file,config.nix $(corepkgs_FILES),$(eval $(call install-data-in,$(d)/$(file),$(datadir)/nix/corepkgs))) diff --git a/corepkgs/nar.nix b/corepkgs/nar.nix deleted file mode 100644 index 61b3fc677..000000000 --- a/corepkgs/nar.nix +++ /dev/null @@ -1,48 +0,0 @@ -with import <nix/config.nix>; - -let - - builder = builtins.toFile "nar.sh" - '' - export PATH=${nixBinDir}:${coreutils} - - if [ $compressionType = xz ]; then - ext=.xz - compressor="| ${xz} -7" - elif [ $compressionType = bzip2 ]; then - ext=.bz2 - compressor="| ${bzip2}" - else - ext= - compressor= - fi - - echo "packing ‘$storePath’..." - mkdir $out - dst=$out/tmp.nar$ext - - set -o pipefail - eval "nix-store --dump \"$storePath\" $compressor > $dst" - - hash=$(nix-hash --flat --type $hashAlgo --base32 $dst) - echo -n $hash > $out/nar-compressed-hash - - mv $dst $out/$hash.nar$ext - ''; - -in - -{ storePath, hashAlgo, compressionType }: - -derivation { - name = "nar"; - system = builtins.currentSystem; - builder = shell; - args = [ "-e" builder ]; - inherit storePath hashAlgo compressionType; - - # Remote machines may not have ${nixBinDir} or ${coreutils} in the same prefixes - preferLocalBuild = true; - - inherit chrootDeps; -} |