mirror of
https://github.com/NixOS/nix
synced 2025-06-25 02:21:16 +02:00
Revert "Merge pull request #11826 from DeterminateSystems/revert-11804"
This reverts commitaeffdeffc8
, reversing changes made to723fdeb4f1
.
This commit is contained in:
parent
fa4bd39c6a
commit
f29e7867a9
134 changed files with 75 additions and 4722 deletions
|
@ -2,7 +2,7 @@
|
|||
|
||||
{ pkgs }:
|
||||
|
||||
(pkgs.nix.override { forDevShell = true; }).overrideAttrs (attrs:
|
||||
pkgs.nixComponents.nix-util.overrideAttrs (attrs:
|
||||
|
||||
let
|
||||
stdenv = pkgs.nixDependencies.stdenv;
|
||||
|
@ -88,9 +88,12 @@ in {
|
|||
buildInputs = attrs.buildInputs or []
|
||||
++ pkgs.nixComponents.nix-util.buildInputs
|
||||
++ pkgs.nixComponents.nix-store.buildInputs
|
||||
++ pkgs.nixComponents.nix-store-tests.externalBuildInputs
|
||||
++ pkgs.nixComponents.nix-fetchers.buildInputs
|
||||
++ pkgs.nixComponents.nix-expr.buildInputs
|
||||
++ pkgs.nixComponents.nix-store-tests.externalBuildInputs
|
||||
++ pkgs.nixComponents.nix-expr.externalPropagatedBuildInputs
|
||||
++ pkgs.nixComponents.nix-cmd.buildInputs
|
||||
++ lib.optionals havePerl pkgs.nixComponents.nix-perl-bindings.externalBuildInputs
|
||||
++ lib.optional havePerl pkgs.perl
|
||||
;
|
||||
})
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue