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

apple misc pkgs: buildInputs -> nativeBuildInputs

Browse Source
This commit is contained in:
John Ericson 2017-08-10 18:57:42 -04:00
parent 42e639066b
commit 7a22c01b54
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 }: { stdenv, cctools, appleDerivation }:
appleDerivation { appleDerivation {
buildInputs = [ cctools ]; nativeBuildInputs = [ cctools ];
postPatch = '' postPatch = ''
substituteInPlace makefile \ substituteInPlace makefile \

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

@ -3,7 +3,7 @@
appleDerivation { appleDerivation {
phases = [ "unpackPhase" "installPhase" ]; phases = [ "unpackPhase" "installPhase" ];
buildInputs = [ ed unifdef ]; nativeBuildInputs = [ ed unifdef ];
installPhase = '' installPhase = ''
export SRCROOT=$PWD export SRCROOT=$PWD

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

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

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

@ -5,7 +5,7 @@
appleDerivation rec { appleDerivation rec {
phases = [ "unpackPhase" "installPhase" ]; phases = [ "unpackPhase" "installPhase" ];
buildInputs = [ cpio ]; nativeBuildInputs = [ cpio ];
installPhase = '' installPhase = ''
export NIX_ENFORCE_PURITY= 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 { in appleDerivation {
buildInputs = [ bsdmake perl yacc flex ]; nativeBuildInputs = [ bsdmake perl yacc flex ];
buildInputs = [ flex ];
patchPhase = '' patchPhase = ''
substituteInPlace BSDmakefile \ substituteInPlace BSDmakefile \

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

@ -1,7 +1,7 @@
{ stdenv, appleDerivation, yacc, flex }: { stdenv, appleDerivation, yacc, flex }:
appleDerivation { appleDerivation {
buildInputs = [ yacc flex ]; nativeBuildInputs = [ yacc flex ];
buildPhase = '' buildPhase = ''
cd migcom.tproj cd migcom.tproj

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

@ -1,7 +1,7 @@
{ stdenv, appleDerivation, fetchurl, fetchpatch, makeWrapper }: { stdenv, appleDerivation, fetchurl, fetchpatch, makeWrapper }:
appleDerivation { appleDerivation {
buildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
patchPhase = '' patchPhase = ''
substituteInPlace mk/bsd.prog.mk \ substituteInPlace mk/bsd.prog.mk \
@ -27,9 +27,9 @@ appleDerivation {
for file in $(find . -name '*.c'); do for file in $(find . -name '*.c'); do
obj="$(basename "$file" .c).o" obj="$(basename "$file" .c).o"
objs+=("$obj") 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 done
cc "''${objs[@]}" -o bsdmake $CC "''${objs[@]}" -o bsdmake
''; '';
installPhase = '' installPhase = ''

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

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

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

@ -29,7 +29,8 @@ let
sha256 = "0l45mvyags56jfi24rawms8j2ihbc45mq7v13pkrrwppghqrdn52"; 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) # 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) [ llvm clang ] ++
stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ]; stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ];