diff options
| author | Ben Wolsieffer <benwolsieffer@gmail.com> | 2022-03-20 13:03:39 -0400 |
|---|---|---|
| committer | Ben Wolsieffer <benwolsieffer@gmail.com> | 2022-03-20 13:49:59 -0400 |
| commit | 9f7e505dd7de32cd33b6d8cc905edfd6d4971c1a (patch) | |
| tree | c4cdbc57d2561824410a07b0b7c9caff581e9c4d /pkgs | |
| parent | 0fb9c4bec36c5f73171ef13e9f0e92fc022b6ba2 (diff) | |
| download | nixlib-9f7e505dd7de32cd33b6d8cc905edfd6d4971c1a.tar nixlib-9f7e505dd7de32cd33b6d8cc905edfd6d4971c1a.tar.gz nixlib-9f7e505dd7de32cd33b6d8cc905edfd6d4971c1a.tar.bz2 nixlib-9f7e505dd7de32cd33b6d8cc905edfd6d4971c1a.tar.lz nixlib-9f7e505dd7de32cd33b6d8cc905edfd6d4971c1a.tar.xz nixlib-9f7e505dd7de32cd33b6d8cc905edfd6d4971c1a.tar.zst nixlib-9f7e505dd7de32cd33b6d8cc905edfd6d4971c1a.zip | |
nix: make Perl bindings use matching Nix version
Previously, 'nix_2_6.perl-bindings' (for example) was built from the Nix 2.6 but linked against 'nix' (the latest version). This usually causes the build to fail.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/package-management/nix/common.nix | 9 | ||||
| -rw-r--r-- | pkgs/tools/package-management/nix/nix-perl.nix | 5 |
2 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix index 2161ea3c309f..2f9a6be8f66b 100644 --- a/pkgs/tools/package-management/nix/common.nix +++ b/pkgs/tools/package-management/nix/common.nix @@ -53,8 +53,8 @@ in , confDir , stateDir , storeDir -}: -stdenv.mkDerivation { +}: let +self = stdenv.mkDerivation { pname = "nix"; version = "${version}${suffix}"; @@ -209,6 +209,7 @@ stdenv.mkDerivation { passthru = { inherit aws-sdk-cpp boehmgc; - perl-bindings = perl.pkgs.toPerlModule (callPackage ./nix-perl.nix { inherit src version; }); + perl-bindings = perl.pkgs.toPerlModule (callPackage ./nix-perl.nix { nix = self; }); }; -} +}; +in self diff --git a/pkgs/tools/package-management/nix/nix-perl.nix b/pkgs/tools/package-management/nix/nix-perl.nix index 069a22d3a853..302d123a87d3 100644 --- a/pkgs/tools/package-management/nix/nix-perl.nix +++ b/pkgs/tools/package-management/nix/nix-perl.nix @@ -8,14 +8,11 @@ , autoreconfHook , autoconf-archive , nlohmann_json - -, version -, src }: stdenv.mkDerivation { pname = "nix-perl"; - inherit version src; + inherit (nix) version src; postUnpack = "sourceRoot=$sourceRoot/perl"; |