mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 15:11:35 +00:00
Code Issues Wiki Activity

Merge pull request #52251 from Ericson2314/fix-darwin-bootstrap-cmds

Browse source 
treewide: Use "buildPackages" darwin for bootstrap_cmds
This commit is contained in:
Matthew Bauer 2018-12-17 22:53:14 -06:00 committed by GitHub
parent b0ccd8be8e 49da4548b1
commit a456a54c18
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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

@ -6605,7 +6605,7 @@ in
}; };
ccl = callPackage ../development/compilers/ccl { ccl = callPackage ../development/compilers/ccl {
inherit (darwin) bootstrap_cmds; inherit (buildPackages.darwin) bootstrap_cmds;
}; };
cdb = callPackage ../development/tools/database/cdb { }; cdb = callPackage ../development/tools/database/cdb { };
@ -9164,7 +9164,7 @@ in
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;
}; };
valgrind-light = res.valgrind.override { gdb = null; }; valgrind-light = res.valgrind.override { gdb = null; };
@ -10448,7 +10448,7 @@ in
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 {
@ -14117,7 +14117,7 @@ in
inherit (darwin) cf-private; inherit (darwin) cf-private;
inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa; inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa;
inherit (darwin.apple_sdk.libs) Xplugin; inherit (darwin.apple_sdk.libs) Xplugin;
bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null; inherit (buildPackages.darwin) bootstrap_cmds;
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;
abiCompat = config.xorg.abiCompat # `config` because we have no `xorg.override` abiCompat = config.xorg.abiCompat # `config` because we have no `xorg.override`