Commit 8f72b28d authored by John Ericson's avatar John Ericson
Browse files

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.
parent c1f025a5

pkgs/tools/package-management/nix/modular/doc/manual/package.nix

+3 −5
Original line number Diff line number Diff line
@@ -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

  ];

pkgs/tools/package-management/nix/modular/src/libexpr/package.nix

+0 −5
Original line number Diff line number Diff line
@@ -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

  ]

pkgs/tools/package-management/nix/modular/src/libstore-tests/package.nix

+1 −4
Original line number Diff line number Diff line
@@ -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

pkgs/tools/package-management/nix/modular/src/perl/package.nix

+0 −5
Original line number Diff line number Diff line
@@ -27,11 +27,6 @@ perl.pkgs.toPerlModule ( 


    buildInputs = [

      nix-store

    ]

    ++ finalAttrs.passthru.externalBuildInputs;



    # Hack for sake of the dev shell

    passthru.externalBuildInputs = [

      bzip2

      libsodium

    ];

pkgs/tools/package-management/nix/modular/tests/functional/package.nix

+3 −5
Original line number Diff line number Diff line
@@ -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

    ];