wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 02:21:16 +02:00
Code Activity

Revert "Merge pull request #11804 from obsidiansystems/remove-old-make"

Browse source 
This reverts commit 619eeb658a, reversing
changes made to 1af94bf471.
This commit is contained in:
Eelco Dolstra 2024-11-07 13:46:37 +01:00
parent 3ab8534b13
commit 67d231c046
134 changed files with 4722 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

7
packaging/dev-shell.nix
View file

@ -2,7 +2,7 @@
{ pkgs }:
pkgs.nixComponents.nix-util.overrideAttrs (attrs:
(pkgs.nix.override { forDevShell = true; }).overrideAttrs (attrs:
let
stdenv = pkgs.nixDependencies.stdenv;
@ -88,12 +88,9 @@ 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-expr.externalPropagatedBuildInputs
++ pkgs.nixComponents.nix-cmd.buildInputs
++ lib.optionals havePerl pkgs.nixComponents.nix-perl-bindings.externalBuildInputs
++ pkgs.nixComponents.nix-store-tests.externalBuildInputs
++ lib.optional havePerl pkgs.perl
;
})