diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-02-13 18:29:16 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-13 18:29:16 +0000 |
| commit | 7cc1f8e032b4e532cf4f9f407bad344918e24b3f (patch) | |
| tree | 196a15121d87ca73faa6c04a828b99a778afc7db | |
| parent | 58d69519718d71f5794c87404bac4ee44b16a5cd (diff) | |
| parent | 8092ca8312c543f24df7b7485a932cfd0fdba05e (diff) | |
| download | nixlib-7cc1f8e032b4e532cf4f9f407bad344918e24b3f.tar nixlib-7cc1f8e032b4e532cf4f9f407bad344918e24b3f.tar.gz nixlib-7cc1f8e032b4e532cf4f9f407bad344918e24b3f.tar.bz2 nixlib-7cc1f8e032b4e532cf4f9f407bad344918e24b3f.tar.lz nixlib-7cc1f8e032b4e532cf4f9f407bad344918e24b3f.tar.xz nixlib-7cc1f8e032b4e532cf4f9f407bad344918e24b3f.tar.zst nixlib-7cc1f8e032b4e532cf4f9f407bad344918e24b3f.zip | |
Merge pull request #55146 from Ma27/fix-nix1-perl-bindings
nix1: fix `perl-bindings` build
| -rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index d86dfa316193..76d11a03fc44 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -13,7 +13,7 @@ let sh = busybox-sandbox-shell; - common = { name, suffix ? "", src, fromGit ? false }: + common = { name, suffix ? "", src, includesPerl ? false, fromGit ? false }: let nix = stdenv.mkDerivation rec { inherit name src; version = lib.getVersion name; @@ -113,7 +113,7 @@ let passthru = { inherit fromGit; - perl-bindings = stdenv.mkDerivation { + perl-bindings = if includesPerl then nix else stdenv.mkDerivation { name = "nix-perl-${version}"; inherit src; @@ -150,6 +150,9 @@ in rec { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; sha256 = "0ca5782fc37d62238d13a620a7b4bff6a200bab1bd63003709249a776162357c"; }; + + # Nix1 has the perl bindings by default, so no need to build the manually. + includesPerl = true; }; nixStable = common rec { |