BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

treewide: use "buildPackages" darwin for bootstrap_cmds

Browse source 
These are almost always from buildPackages. Another issue where
splicing doesn’t seem to pick them up correctly.

(cherry picked from commit 9ab67898f7)
This commit is contained in:
Matthew Bauer 2018-12-10 18:22:03 -06:00 committed by John Ericson
parent cb5a7bdc3a
commit dd78e629aa
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/top-level/all-packages.nix
View file

@ -6319,7 +6319,7 @@ with pkgs;
}; };
ccl = callPackage ../development/compilers/ccl { ccl = callPackage ../development/compilers/ccl {
inherit (darwin) bootstrap_cmds; inherit (buildPackages.darwin) bootstrap_cmds;
}; };
chez = callPackage ../development/compilers/chez { chez = callPackage ../development/compilers/chez {
@ -8772,7 +8772,7 @@ with pkgs;
jhiccup = callPackage ../development/tools/java/jhiccup { }; jhiccup = callPackage ../development/tools/java/jhiccup { };
valgrind = callPackage ../development/tools/analysis/valgrind { valgrind = callPackage ../development/tools/analysis/valgrind {
inherit (darwin) xnu bootstrap_cmds cctools; inherit (buildPackages.darwin) xnu bootstrap_cmds cctools;
llvm = llvm_39; llvm = llvm_39;
}; };
valgrind-light = self.valgrind.override { gdb = null; }; valgrind-light = self.valgrind.override { gdb = null; };
@ -10033,7 +10033,7 @@ with pkgs;
kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { }; kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { };
krb5 = callPackage ../development/libraries/kerberos/krb5.nix { krb5 = callPackage ../development/libraries/kerberos/krb5.nix {
inherit (darwin) bootstrap_cmds; inherit (buildPackages.darwin) bootstrap_cmds;
}; };
krb5Full = krb5; krb5Full = krb5;
libkrb5 = krb5.override { libkrb5 = krb5.override {
@ -13574,7 +13574,7 @@ with pkgs;
xorg = recurseIntoAttrs ((lib.callPackageWith __splicedPackages ../servers/x11/xorg { xorg = recurseIntoAttrs ((lib.callPackageWith __splicedPackages ../servers/x11/xorg {
}).overrideScope' (lib.callPackageWith __splicedPackages ../servers/x11/xorg/overrides.nix { }).overrideScope' (lib.callPackageWith __splicedPackages ../servers/x11/xorg/overrides.nix {
inherit (darwin) apple_sdk; inherit (darwin) apple_sdk;
bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null; bootstrap_cmds = if stdenv.isDarwin then buildPackages.darwin.bootstrap_cmds else null;
python = python2; # Incompatible with Python 3x python = python2; # Incompatible with Python 3x
udev = if stdenv.isLinux then udev else null; udev = if stdenv.isLinux then udev else null;
libdrm = if stdenv.isLinux then libdrm else null; libdrm = if stdenv.isLinux then libdrm else null;