public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #55146 from Ma27/fix-nix1-perl-bindings

Browse Source 
nix1: fix `perl-bindings` build
This commit is contained in:
Alyssa Ross 2019-02-13 18:29:16 +00:00 committed by GitHub
commit 7cc1f8e032
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/tools/package-management/nix/default.nix
View File

@ -13,7 +13,7 @@ let
sh = busybox-sandbox-shell; sh = busybox-sandbox-shell;
common = { name, suffix ? "", src, fromGit ? false }: common = { name, suffix ? "", src, includesPerl ? false, fromGit ? false }:
let nix = stdenv.mkDerivation rec { let nix = stdenv.mkDerivation rec {
inherit name src; inherit name src;
version = lib.getVersion name; version = lib.getVersion name;
@ -113,7 +113,7 @@ let
passthru = { passthru = {
inherit fromGit; inherit fromGit;
perl-bindings = stdenv.mkDerivation { perl-bindings = if includesPerl then nix else stdenv.mkDerivation {
name = "nix-perl-${version}"; name = "nix-perl-${version}";
inherit src; inherit src;
@ -150,6 +150,9 @@ in rec {
url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
sha256 = "0ca5782fc37d62238d13a620a7b4bff6a200bab1bd63003709249a776162357c"; sha256 = "0ca5782fc37d62238d13a620a7b4bff6a200bab1bd63003709249a776162357c";
}; };
# Nix1 has the perl bindings by default, so no need to build the manually.
includesPerl = true;
}; };
nixStable = common rec { nixStable = common rec {