From 3c9b9859b302ca19f19b31097ee2b00380c3a44d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 17 Aug 2024 22:16:28 +0200
Subject: [PATCH] nix-perl: fix build for 2.24

---
 pkgs/tools/package-management/nix/nix-perl.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/nix/nix-perl.nix b/pkgs/tools/package-management/nix/nix-perl.nix
index 2233525ec62e..f80ce5698a2e 100644
--- a/pkgs/tools/package-management/nix/nix-perl.nix
+++ b/pkgs/tools/package-management/nix/nix-perl.nix
@@ -8,7 +8,6 @@
 , boost
 , autoreconfHook
 , autoconf-archive
-, nlohmann_json
 , xz
 , Security
 , meson
@@ -18,6 +17,7 @@
 
 let
   atLeast223 = lib.versionAtLeast nix.version "2.23";
+  atLeast224 = lib.versionAtLeast nix.version "2.24";
 
   mkConfigureOption = { mesonOption, autoconfOption, value }:
     let
@@ -30,7 +30,14 @@ in stdenv.mkDerivation (finalAttrs: {
   pname = "nix-perl";
   inherit (nix) version src;
 
-  postUnpack = "sourceRoot=$sourceRoot/perl";
+  postUnpack = "sourceRoot=$sourceRoot/${lib.optionalString atLeast224 "src"}/perl";
+
+  # TODO: Remove this once the nix build also uses meson
+  postPatch = lib.optionalString atLeast224 ''
+    substituteInPlace lib/Nix/Store.xs \
+      --replace-fail 'config-util.hh' 'nix/config.h' \
+      --replace-fail 'config-store.hh' 'nix/config.h'
+  '';
 
   buildInputs = [
     boost