From 5a9dcfd10ac62bfe826624aaf193a2c79d91b6ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 21 Sep 2024 17:26:29 +0200 Subject: [PATCH] nix-serve: 77ffa33d8 -> 0.0.2 (#343319) nix-serve: make sure that we use the same perl for bindings and nix-serve --- pkgs/tools/package-management/nix-serve/default.nix | 2 +- pkgs/tools/package-management/nix/nix-perl.nix | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix-serve/default.nix b/pkgs/tools/package-management/nix-serve/default.nix index acff56e8c015..f8e181e9fa21 100644 --- a/pkgs/tools/package-management/nix-serve/default.nix +++ b/pkgs/tools/package-management/nix-serve/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , bzip2 , nixVersions -, perl , makeWrapper , nixosTests , fetchpatch @@ -13,6 +12,7 @@ let rev = "77ffa33d83d2c7c6551c5e420e938e92d72fec24"; sha256 = "sha256-MJRdVO2pt7wjOu5Hk0eVeNbk5bK5+Uo/Gh9XfO4OlMY="; nix = nixVersions.nix_2_24; + inherit (nix.perl-bindings) perl; in stdenv.mkDerivation { diff --git a/pkgs/tools/package-management/nix/nix-perl.nix b/pkgs/tools/package-management/nix/nix-perl.nix index f80ce5698a2e..4c93fcef564a 100644 --- a/pkgs/tools/package-management/nix/nix-perl.nix +++ b/pkgs/tools/package-management/nix/nix-perl.nix @@ -87,4 +87,6 @@ in stdenv.mkDerivation (finalAttrs: { ]; preConfigure = "export NIX_STATE_DIR=$TMPDIR"; + + passthru = { inherit perl; }; })