diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-12-28 19:20:09 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-12-28 19:20:09 +0100 |
commit | ab3eeabfeddacf3e159e68ee1541a6281a1e9d1b (patch) | |
tree | 8070852a5ee331104a06de5395d30223185f936a /pkgs/os-specific/linux | |
parent | 5be0a9acd7b9abe4bff3202a7ac7defc17a37877 (diff) | |
download | nixpkgs-ab3eeabfeddacf3e159e68ee1541a6281a1e9d1b.tar nixpkgs-ab3eeabfeddacf3e159e68ee1541a6281a1e9d1b.tar.gz nixpkgs-ab3eeabfeddacf3e159e68ee1541a6281a1e9d1b.tar.bz2 nixpkgs-ab3eeabfeddacf3e159e68ee1541a6281a1e9d1b.tar.lz nixpkgs-ab3eeabfeddacf3e159e68ee1541a6281a1e9d1b.tar.xz nixpkgs-ab3eeabfeddacf3e159e68ee1541a6281a1e9d1b.tar.zst nixpkgs-ab3eeabfeddacf3e159e68ee1541a6281a1e9d1b.zip |
Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc. "buildNativeInputs" sounds like an imperative rather than a noun phrase.
Diffstat (limited to 'pkgs/os-specific/linux')
-rw-r--r-- | pkgs/os-specific/linux/alsa-utils/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/iproute/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/generic.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/manual-config.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/perf.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/klibc/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/libcap/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/libcgroup/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/mdadm/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/pam/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/udisks/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/upower/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/wpa_supplicant/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/wpa_supplicant/gui.nix | 2 |
14 files changed, 14 insertions, 14 deletions
diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index ebaef323491..08df6fe64c2 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ alsaLib ncurses ]; - buildNativeInputs = [ gettext ]; + nativeBuildInputs = [ gettext ]; configureFlags = "--disable-xmlto --with-udev-rules-dir=$(out)/lib/udev/rules.d"; diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index c97c7416de1..2b22f4a2881 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { + " MANDIR=$(out)/share/man"; buildInputs = [ db4 iptables ]; - buildNativeInputs = [ bison flex pkgconfig ]; + nativeBuildInputs = [ bison flex pkgconfig ]; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 48c4679cb3c..eecf52b1ddf 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation { # For UML and non-PC, just ignore all options that don't apply (We are lazy). ignoreConfigErrors = stdenv.platform.name != "pc"; - buildNativeInputs = [ perl mktemp ]; + nativeBuildInputs = [ perl mktemp ]; buildInputs = lib.optional (stdenv.platform.uboot != null) (ubootChooser stdenv.platform.uboot); diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 52e284827d0..70d5c809dba 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -125,7 +125,7 @@ stdenv.mkDerivation { runHook postConfigure ''; - buildNativeInputs = [ perl nettools ]; + nativeBuildInputs = [ perl nettools ]; makeFlags = commonMakeFlags ++ [ "INSTALLKERNEL=${installkernel stdenv.platform.kernelTarget}" diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index 85aa7456df5..8f2db1b15bd 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { ''; # perf refers both to newt and slang - buildNativeInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt flex bison ]; + nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt flex bison ]; buildInputs = [ elfutils python perl newt slang pkgconfig] ++ stdenv.lib.optional withGtk gtk; diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix index 781bb67edca..42fd6097da0 100644 --- a/pkgs/os-specific/linux/klibc/default.nix +++ b/pkgs/os-specific/linux/klibc/default.nix @@ -70,5 +70,5 @@ stdenv.mkDerivation { cp usr/dash/sh $dir/ ''; - buildNativeInputs = [ perl bison mktemp ]; + nativeBuildInputs = [ perl bison mktemp ]; } diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index 667fe63bba7..92f15c1ade3 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "03q50j6bg65cc501q87qh328ncav1i8qw2bjig99vxmmfx4bvsvk"; }; - buildNativeInputs = [ perl ]; + nativeBuildInputs = [ perl ]; propagatedBuildInputs = [ attr ]; preConfigure = "cd libcap"; diff --git a/pkgs/os-specific/linux/libcgroup/default.nix b/pkgs/os-specific/linux/libcgroup/default.nix index 0246f6729b1..6323d8c4f23 100644 --- a/pkgs/os-specific/linux/libcgroup/default.nix +++ b/pkgs/os-specific/linux/libcgroup/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ pam ]; - buildNativeInputs = [ yacc flex ]; + nativeBuildInputs = [ yacc flex ]; meta = { description = "Library and tools to manage Linux's cgroup resource management system"; diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index a88107ae73d..1653c018ce1 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { # Enable incremental activation of swraid arrays from udev. patches = [ ./udev.patch ]; - buildNativeInputs = [ groff ]; + nativeBuildInputs = [ groff ]; preConfigure = "sed -e 's@/lib/udev@\${out}/lib/udev@' -e 's@ -Werror @ @' -i Makefile"; diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index 31317a93977..112c82d1ea0 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1hlz2kqvbjisvwyicdincq7nz897b9rrafyzccwzqiqg53b8gf5s"; }; - buildNativeInputs = [ flex ]; + nativeBuildInputs = [ flex ]; buildInputs = [ cracklib ] ++ stdenv.lib.optional diff --git a/pkgs/os-specific/linux/udisks/default.nix b/pkgs/os-specific/linux/udisks/default.nix index 4987e90429c..ea4fd1ca2cb 100644 --- a/pkgs/os-specific/linux/udisks/default.nix +++ b/pkgs/os-specific/linux/udisks/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { lvm2 libatasmart intltool libuuid libxslt docbook_xsl ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; configureFlags = "--localstatedir=/var --enable-lvm2"; diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 2f870e5d999..c31dae1fdfa 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { [ dbus_glib polkit intltool libxslt docbook_xsl udev libusb1 ] ++ stdenv.lib.optional useSystemd systemd; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; configureFlags = [ "--with-backend=linux" "--localstatedir=/var" ] diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index f947bc9a1e7..c6846b8fd13 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl dbus_libs libnl ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; patches = [ (fetchurl { diff --git a/pkgs/os-specific/linux/wpa_supplicant/gui.nix b/pkgs/os-specific/linux/wpa_supplicant/gui.nix index 12ec08361a6..29591bf0335 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/gui.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/gui.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { buildInputs = [ qt4 ]; - buildNativeInputs = [ inkscape ]; + nativeBuildInputs = [ inkscape ]; prePatch = "cd wpa_supplicant/wpa_gui-qt4"; |