diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-03-27 12:01:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-27 12:01:02 +0200 |
| commit | 1f19bc633ef535cdc97259b0b492edc0c41045b7 (patch) | |
| tree | edaf2b7d2098902cba0ff6fbf1683f5c996baf11 /pkgs | |
| parent | c5f030bb1e2ab079282e22e814c939077de782d7 (diff) | |
| parent | 9f7e505dd7de32cd33b6d8cc905edfd6d4971c1a (diff) | |
| download | nixlib-1f19bc633ef535cdc97259b0b492edc0c41045b7.tar nixlib-1f19bc633ef535cdc97259b0b492edc0c41045b7.tar.gz nixlib-1f19bc633ef535cdc97259b0b492edc0c41045b7.tar.bz2 nixlib-1f19bc633ef535cdc97259b0b492edc0c41045b7.tar.lz nixlib-1f19bc633ef535cdc97259b0b492edc0c41045b7.tar.xz nixlib-1f19bc633ef535cdc97259b0b492edc0c41045b7.tar.zst nixlib-1f19bc633ef535cdc97259b0b492edc0c41045b7.zip | |
Merge pull request #165004 from lopsided98/nix-perl-bindings-match-version
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"; |