BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

nix1: fix perl-bindings build

Browse source 
Nix 1.11 builds perl-bindings by default, `nix1.perl-bindings` fails
with the following error:

```
building
no Makefile, doing nothing
installing
install flags: install
make: *** No rule to make target 'install'.  Stop.
```

This is probably due to #47316. Previously the `perl-bindings` were
referenced to `nix1` instead of the `perl-bindings` function as Nix 1.11
built those during its build process.
This commit is contained in:
Maximilian Bosch 2019-02-04 00:45:10 +01:00
parent 4a394e4150
commit 8092ca8312
No known key found for this signature in database
GPG key ID: 091DBF4D1FC46B8E
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;
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 {