From 7a22c01b546fb14c9fec8ab1f9bcba2845e354b7 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 10 Aug 2017 18:57:42 -0400 Subject: [PATCH] apple misc pkgs: `buildInputs` -> `nativeBuildInputs` --- .../darwin/apple-source-releases/ICU/default.nix | 2 +- .../darwin/apple-source-releases/Libc/825_40_1.nix | 4 ++-- .../darwin/apple-source-releases/Libc/default.nix | 2 +- .../darwin/apple-source-releases/Libsystem/default.nix | 2 +- .../darwin/apple-source-releases/adv_cmds/default.nix | 3 ++- .../darwin/apple-source-releases/bootstrap_cmds/default.nix | 4 ++-- .../darwin/apple-source-releases/bsdmake/default.nix | 6 +++--- .../darwin/apple-source-releases/configd/default.nix | 3 ++- pkgs/os-specific/darwin/cctools/port.nix | 3 ++- 9 files changed, 16 insertions(+), 13 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix b/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix index a9d06fc9dbc3..2d098418f030 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix @@ -1,7 +1,7 @@ { stdenv, cctools, appleDerivation }: appleDerivation { - buildInputs = [ cctools ]; + nativeBuildInputs = [ cctools ]; postPatch = '' substituteInPlace makefile \ diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix b/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix index b5e7e5123930..0fa9294f2290 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix @@ -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 ''; -} \ No newline at end of file +} diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix index ce04be0e0836..40237b27bd26 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix @@ -3,7 +3,7 @@ appleDerivation { phases = [ "unpackPhase" "installPhase" ]; - buildInputs = [ ed unifdef ]; + nativeBuildInputs = [ ed unifdef ]; # TODO: asl.h actually comes from syslog project now installPhase = '' diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix index e3583b3bf84a..caef875ac136 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix @@ -5,7 +5,7 @@ appleDerivation rec { phases = [ "unpackPhase" "installPhase" ]; - buildInputs = [ cpio ]; + nativeBuildInputs = [ cpio ]; installPhase = '' export NIX_ENFORCE_PURITY= diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix index b8b436efe24f..ccbd8343e0d0 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix @@ -16,7 +16,8 @@ let recentAdvCmds = fetchzip { }; in appleDerivation { - buildInputs = [ bsdmake perl yacc flex ]; + nativeBuildInputs = [ bsdmake perl yacc flex ]; + buildInputs = [ flex ]; patchPhase = '' substituteInPlace BSDmakefile \ diff --git a/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix index 8dce3fd36097..408a2c7524c3 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix @@ -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" ''; -} \ No newline at end of file +} diff --git a/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix b/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix index dcbf8b433088..77123d0057d3 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix @@ -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 = '' diff --git a/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix b/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix index 24797fc286a7..2b31b0420402 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix @@ -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 ]; diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index 515471007527..1f2e7c143780 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -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 ];