From 9f7e505dd7de32cd33b6d8cc905edfd6d4971c1a Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Sun, 20 Mar 2022 13:03:39 -0400
Subject: 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.
---
 pkgs/tools/package-management/nix/common.nix   | 9 +++++----
 pkgs/tools/package-management/nix/nix-perl.nix | 5 +----
 2 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'pkgs')

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";
 
-- 
cgit 1.4.1