From 8f72b28d567f0e576c107fe5b80acdd6e6961806 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 3 Dec 2025 15:05:27 -0500
Subject: [PATCH] nix: Fix splicing

This is a port of
https://github.com/nixos/nix/commit/cb5b0c30aa5733b40cc70089fe3829cb1046c352
from https://github.com/NixOS/nix/pull/14489 but adopted to preserve
dependency order, and this not cause rebuilds.

We only need the one commit of that PR because we don't care about a dev
shell for Nix in Nixpkgs.
---
 .../package-management/nix/modular/doc/manual/package.nix | 8 +++-----
 .../nix/modular/src/libexpr/package.nix                   | 5 -----
 .../nix/modular/src/libstore-tests/package.nix            | 5 +----
 .../package-management/nix/modular/src/perl/package.nix   | 5 -----
 .../nix/modular/tests/functional/package.nix              | 8 +++-----
 5 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/pkgs/tools/package-management/nix/modular/doc/manual/package.nix b/pkgs/tools/package-management/nix/modular/doc/manual/package.nix
index b6f58434bd8b2..d8dcf40ebfa4b 100644
--- a/pkgs/tools/package-management/nix/modular/doc/manual/package.nix
+++ b/pkgs/tools/package-management/nix/modular/doc/manual/package.nix
@@ -30,8 +30,7 @@ mkMesonDerivation (finalAttrs: {
     "man"
   ];
 
-  # Hack for sake of the dev shell
-  passthru.externalNativeBuildInputs = [
+  nativeBuildInputs = [
     meson
     ninja
     (lib.getBin lowdown-unsandboxed)
@@ -43,9 +42,8 @@ mkMesonDerivation (finalAttrs: {
   ]
   ++ lib.optional (lib.versionAtLeast (lib.versions.majorMinor version) "2.33") [
     json-schema-for-humans
-  ];
-
-  nativeBuildInputs = finalAttrs.passthru.externalNativeBuildInputs ++ [
+  ]
+  ++ [
     nix-cli
   ];
 
diff --git a/pkgs/tools/package-management/nix/modular/src/libexpr/package.nix b/pkgs/tools/package-management/nix/modular/src/libexpr/package.nix
index 44fc5b105d8cb..79cb2c93e2594 100644
--- a/pkgs/tools/package-management/nix/modular/src/libexpr/package.nix
+++ b/pkgs/tools/package-management/nix/modular/src/libexpr/package.nix
@@ -51,11 +51,6 @@ mkMesonLibrary (finalAttrs: {
     nix-util
     nix-store
     nix-fetchers
-  ]
-  ++ finalAttrs.passthru.externalPropagatedBuildInputs;
-
-  # Hack for sake of the dev shell
-  passthru.externalPropagatedBuildInputs = [
     boost
     nlohmann_json
   ]
diff --git a/pkgs/tools/package-management/nix/modular/src/libstore-tests/package.nix b/pkgs/tools/package-management/nix/modular/src/libstore-tests/package.nix
index ae2c170b05676..cc0f55790f13d 100644
--- a/pkgs/tools/package-management/nix/modular/src/libstore-tests/package.nix
+++ b/pkgs/tools/package-management/nix/modular/src/libstore-tests/package.nix
@@ -26,14 +26,11 @@ mkMesonExecutable (finalAttrs: {
 
   workDir = ./.;
 
-  # Hack for sake of the dev shell
-  passthru.externalBuildInputs = [
+  buildInputs = [
     sqlite
     rapidcheck
     gtest
-  ];
 
-  buildInputs = finalAttrs.passthru.externalBuildInputs ++ [
     nix-store
     nix-store-c
     nix-store-test-support
diff --git a/pkgs/tools/package-management/nix/modular/src/perl/package.nix b/pkgs/tools/package-management/nix/modular/src/perl/package.nix
index f425146fbe339..d769d45d0f59a 100644
--- a/pkgs/tools/package-management/nix/modular/src/perl/package.nix
+++ b/pkgs/tools/package-management/nix/modular/src/perl/package.nix
@@ -27,11 +27,6 @@ perl.pkgs.toPerlModule (
 
     buildInputs = [
       nix-store
-    ]
-    ++ finalAttrs.passthru.externalBuildInputs;
-
-    # Hack for sake of the dev shell
-    passthru.externalBuildInputs = [
       bzip2
       libsodium
     ];
diff --git a/pkgs/tools/package-management/nix/modular/tests/functional/package.nix b/pkgs/tools/package-management/nix/modular/tests/functional/package.nix
index 6beb61c945a7a..1cd52f7d50577 100644
--- a/pkgs/tools/package-management/nix/modular/tests/functional/package.nix
+++ b/pkgs/tools/package-management/nix/modular/tests/functional/package.nix
@@ -35,8 +35,7 @@ mkMesonDerivation (
 
     workDir = ./.;
 
-    # Hack for sake of the dev shell
-    passthru.externalNativeBuildInputs = [
+    nativeBuildInputs = [
       meson
       ninja
       pkg-config
@@ -53,9 +52,8 @@ mkMesonDerivation (
       # For `script` command (ensuring a TTY)
       # TODO use `unixtools` to be precise over which executables instead?
       util-linux
-    ];
-
-    nativeBuildInputs = finalAttrs.passthru.externalNativeBuildInputs ++ [
+    ]
+    ++ [
       nix-cli
     ];