JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #28646 from obsidiansystems/apple-native-build-inputs

Browse Source 
apple misc pkgs: `buildInputs` -> `nativeBuildInputs`
This commit is contained in:
John Ericson 2017-08-28 20:06:31 -04:00 committed by GitHub
commit 5790ae3ce0
9 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, cctools, appleDerivation }:
appleDerivation {
buildInputs = [ cctools ];
nativeBuildInputs = [ cctools ];
postPatch = ''
substituteInPlace makefile \

4
pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix
View File

@ -3,7 +3,7 @@
appleDerivation {
phases = [ "unpackPhase" "installPhase" ];
buildInputs = [ ed unifdef ];
nativeBuildInputs = [ ed unifdef ];
installPhase = ''
export SRCROOT=$PWD
@ -12,4 +12,4 @@ appleDerivation {
export PRIVATE_HEADERS_FOLDER_PATH=include
bash xcodescripts/headers.sh
'';
}
}

2
pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix
View File

@ -3,7 +3,7 @@
appleDerivation {
phases = [ "unpackPhase" "installPhase" ];
buildInputs = [ ed unifdef ];
nativeBuildInputs = [ ed unifdef ];
# TODO: asl.h actually comes from syslog project now
installPhase = ''

2
pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
View File

@ -5,7 +5,7 @@
appleDerivation rec {
phases = [ "unpackPhase" "installPhase" ];
buildInputs = [ cpio ];
nativeBuildInputs = [ cpio ];
installPhase = ''
export NIX_ENFORCE_PURITY=

3
pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix
View File

@ -16,7 +16,8 @@ let recentAdvCmds = fetchzip {
};
in appleDerivation {
buildInputs = [ bsdmake perl yacc flex ];
nativeBuildInputs = [ bsdmake perl yacc flex ];
buildInputs = [ flex ];
patchPhase = ''
substituteInPlace BSDmakefile \

4
pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, appleDerivation, yacc, flex }:
appleDerivation {
buildInputs = [ yacc flex ];
nativeBuildInputs = [ yacc flex ];
buildPhase = ''
cd migcom.tproj
@ -41,4 +41,4 @@ appleDerivation {
--replace '/bin/rmdir' "rmdir" \
--replace 'C=''${MIGCC}' "C=cc"
'';
}
}

6
pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, appleDerivation, fetchurl, fetchpatch, makeWrapper }:
appleDerivation {
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
patchPhase = ''
substituteInPlace mk/bsd.prog.mk \
@ -27,9 +27,9 @@ appleDerivation {
for file in $(find . -name '*.c'); do
obj="$(basename "$file" .c).o"
objs+=("$obj")
cc -c "$file" -o "$obj" -DDEFSHELLNAME='"sh"' -D__FBSDID=__RCSID -mdynamic-no-pic -g
$CC -c "$file" -o "$obj" -DDEFSHELLNAME='"sh"' -D__FBSDID=__RCSID -mdynamic-no-pic -g
done
cc "''${objs[@]}" -o bsdmake
$CC "''${objs[@]}" -o bsdmake
'';
installPhase = ''

3
pkgs/os-specific/darwin/apple-source-releases/configd/default.nix
View File

@ -3,7 +3,8 @@
appleDerivation {
meta.broken = stdenv.cc.nativeLibc;
buildInputs = [ launchd bootstrap_cmds ppp IOKit eap8021x ];
nativeBuildInputs = [ bootstrap_cmds ];
buildInputs = [ launchd ppp IOKit eap8021x ];
propagatedBuildInputs = [ Security ];

3
pkgs/os-specific/darwin/cctools/port.nix
View File

@ -29,7 +29,8 @@ let
sha256 = "0l45mvyags56jfi24rawms8j2ihbc45mq7v13pkrrwppghqrdn52";
};
buildInputs = [ autoconf automake libtool_2 libuuid ] ++
nativeBuildInputs = [ autoconf automake libtool_2 ];
buildInputs = [ libuuid ] ++
# Only need llvm and clang if the stdenv isn't already clang-based (TODO: just make a stdenv.cc.isClang)
stdenv.lib.optionals (!stdenv.isDarwin) [ llvm clang ] ++
stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ];