pyrox.dev / nixpkgs
lol
fork atom

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

apple misc pkgs: `buildInputs` -> `nativeBuildInputs`

authored by

John Ericson and committed by
GitHub 5790ae3c 0f043d49

+16 -13
unified split
+1 -1
pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix
··· 1 { stdenv, cctools, appleDerivation }: 2 3 appleDerivation { 4 - buildInputs = [ cctools ]; 5 6 postPatch = '' 7 substituteInPlace makefile \
··· 1 { stdenv, cctools, appleDerivation }: 2 3 appleDerivation { 4 + nativeBuildInputs = [ cctools ]; 5 6 postPatch = '' 7 substituteInPlace makefile \
+2 -2
pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix
··· 3 appleDerivation { 4 phases = [ "unpackPhase" "installPhase" ]; 5 6 - buildInputs = [ ed unifdef ]; 7 8 installPhase = '' 9 export SRCROOT=$PWD ··· 12 export PRIVATE_HEADERS_FOLDER_PATH=include 13 bash xcodescripts/headers.sh 14 ''; 15 - }
··· 3 appleDerivation { 4 phases = [ "unpackPhase" "installPhase" ]; 5 6 + nativeBuildInputs = [ ed unifdef ]; 7 8 installPhase = '' 9 export SRCROOT=$PWD ··· 12 export PRIVATE_HEADERS_FOLDER_PATH=include 13 bash xcodescripts/headers.sh 14 ''; 15 + }
+1 -1
pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix
··· 3 appleDerivation { 4 phases = [ "unpackPhase" "installPhase" ]; 5 6 - buildInputs = [ ed unifdef ]; 7 8 # TODO: asl.h actually comes from syslog project now 9 installPhase = ''
··· 3 appleDerivation { 4 phases = [ "unpackPhase" "installPhase" ]; 5 6 + nativeBuildInputs = [ ed unifdef ]; 7 8 # TODO: asl.h actually comes from syslog project now 9 installPhase = ''
+1 -1
pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
··· 5 appleDerivation rec { 6 phases = [ "unpackPhase" "installPhase" ]; 7 8 - buildInputs = [ cpio ]; 9 10 installPhase = '' 11 export NIX_ENFORCE_PURITY=
··· 5 appleDerivation rec { 6 phases = [ "unpackPhase" "installPhase" ]; 7 8 + nativeBuildInputs = [ cpio ]; 9 10 installPhase = '' 11 export NIX_ENFORCE_PURITY=
+2 -1
pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix
··· 16 }; 17 18 in appleDerivation { 19 - buildInputs = [ bsdmake perl yacc flex ]; 20 21 patchPhase = '' 22 substituteInPlace BSDmakefile \
··· 16 }; 17 18 in appleDerivation { 19 + nativeBuildInputs = [ bsdmake perl yacc flex ]; 20 + buildInputs = [ flex ]; 21 22 patchPhase = '' 23 substituteInPlace BSDmakefile \
+2 -2
pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix
··· 1 { stdenv, appleDerivation, yacc, flex }: 2 3 appleDerivation { 4 - buildInputs = [ yacc flex ]; 5 6 buildPhase = '' 7 cd migcom.tproj ··· 41 --replace '/bin/rmdir' "rmdir" \ 42 --replace 'C=''${MIGCC}' "C=cc" 43 ''; 44 - }
··· 1 { stdenv, appleDerivation, yacc, flex }: 2 3 appleDerivation { 4 + nativeBuildInputs = [ yacc flex ]; 5 6 buildPhase = '' 7 cd migcom.tproj ··· 41 --replace '/bin/rmdir' "rmdir" \ 42 --replace 'C=''${MIGCC}' "C=cc" 43 ''; 44 + }
+3 -3
pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix
··· 1 { stdenv, appleDerivation, fetchurl, fetchpatch, makeWrapper }: 2 3 appleDerivation { 4 - buildInputs = [ makeWrapper ]; 5 6 patchPhase = '' 7 substituteInPlace mk/bsd.prog.mk \ ··· 27 for file in $(find . -name '*.c'); do 28 obj="$(basename "$file" .c).o" 29 objs+=("$obj") 30 - cc -c "$file" -o "$obj" -DDEFSHELLNAME='"sh"' -D__FBSDID=__RCSID -mdynamic-no-pic -g 31 done 32 - cc "''${objs[@]}" -o bsdmake 33 ''; 34 35 installPhase = ''
··· 1 { stdenv, appleDerivation, fetchurl, fetchpatch, makeWrapper }: 2 3 appleDerivation { 4 + nativeBuildInputs = [ makeWrapper ]; 5 6 patchPhase = '' 7 substituteInPlace mk/bsd.prog.mk \ ··· 27 for file in $(find . -name '*.c'); do 28 obj="$(basename "$file" .c).o" 29 objs+=("$obj") 30 + $CC -c "$file" -o "$obj" -DDEFSHELLNAME='"sh"' -D__FBSDID=__RCSID -mdynamic-no-pic -g 31 done 32 + $CC "''${objs[@]}" -o bsdmake 33 ''; 34 35 installPhase = ''
+2 -1
pkgs/os-specific/darwin/apple-source-releases/configd/default.nix
··· 3 appleDerivation { 4 meta.broken = stdenv.cc.nativeLibc; 5 6 - buildInputs = [ launchd bootstrap_cmds ppp IOKit eap8021x ]; 7 8 propagatedBuildInputs = [ Security ]; 9
··· 3 appleDerivation { 4 meta.broken = stdenv.cc.nativeLibc; 5 6 + nativeBuildInputs = [ bootstrap_cmds ]; 7 + buildInputs = [ launchd ppp IOKit eap8021x ]; 8 9 propagatedBuildInputs = [ Security ]; 10
+2 -1
pkgs/os-specific/darwin/cctools/port.nix
··· 29 sha256 = "0l45mvyags56jfi24rawms8j2ihbc45mq7v13pkrrwppghqrdn52"; 30 }; 31 32 - buildInputs = [ autoconf automake libtool_2 libuuid ] ++ 33 # Only need llvm and clang if the stdenv isn't already clang-based (TODO: just make a stdenv.cc.isClang) 34 stdenv.lib.optionals (!stdenv.isDarwin) [ llvm clang ] ++ 35 stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ];
··· 29 sha256 = "0l45mvyags56jfi24rawms8j2ihbc45mq7v13pkrrwppghqrdn52"; 30 }; 31 32 + nativeBuildInputs = [ autoconf automake libtool_2 ]; 33 + buildInputs = [ libuuid ] ++ 34 # Only need llvm and clang if the stdenv isn't already clang-based (TODO: just make a stdenv.cc.isClang) 35 stdenv.lib.optionals (!stdenv.isDarwin) [ llvm clang ] ++ 36 stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ];