diff options
Diffstat (limited to 'pkgs/os-specific/linux')
35 files changed, 82 insertions, 44 deletions
diff --git a/pkgs/os-specific/linux/afuse/default.nix b/pkgs/os-specific/linux/afuse/default.nix index 4cf533110705..67c5ff140874 100644 --- a/pkgs/os-specific/linux/afuse/default.nix +++ b/pkgs/os-specific/linux/afuse/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "1sfhicmxppkvdd4z9klfn63snb71gr9hff6xij1gzk94xg6m0ycc"; }; - buildInputs = [ autoreconfHook pkgconfig fuse ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ fuse ]; meta = { description = "Automounter in userspace"; diff --git a/pkgs/os-specific/linux/alsa-tools/default.nix b/pkgs/os-specific/linux/alsa-tools/default.nix index 23e1f430dec3..940dde1f75dd 100644 --- a/pkgs/os-specific/linux/alsa-tools/default.nix +++ b/pkgs/os-specific/linux/alsa-tools/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { sha256 = "02b75fyfmm9m2iz59d3xa97cas4f697a4pzdxn1i64kjd36iv3yq"; }; - buildInputs = [ alsaLib pkgconfig gtk2 gtk3 fltk13 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ alsaLib gtk2 gtk3 fltk13 ]; patchPhase = '' export tools="as10k1 hda-verb hdspmixer echomixer hdajackretask hdspconf hwmixvolume mixartloader rmedigicontrol sscape_ctl vxloader envy24control hdajacksensetest hdsploader ld10k1 pcxhrloader sb16_csp us428control" diff --git a/pkgs/os-specific/linux/bridge-utils/default.nix b/pkgs/os-specific/linux/bridge-utils/default.nix index eb5d2a31e83a..b8ece86c1401 100644 --- a/pkgs/os-specific/linux/bridge-utils/default.nix +++ b/pkgs/os-specific/linux/bridge-utils/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { # Remove patch once the kernel headers are updated patches = [ ./add-ip6-header.patch ]; - buildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ ]; postInstall = '' # The bridge utils build does not fail even if the brctl binary diff --git a/pkgs/os-specific/linux/btfs/default.nix b/pkgs/os-specific/linux/btfs/default.nix index e51cc582ccf6..6cc4dc6f6d51 100644 --- a/pkgs/os-specific/linux/btfs/default.nix +++ b/pkgs/os-specific/linux/btfs/default.nix @@ -12,8 +12,9 @@ stdenv.mkDerivation rec { sha256 = "0v0mypwnx832f7vg52wmiw0lyz7rrkhqsgi7zc261ak1gfaw4nwd"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - boost autoreconfHook pkgconfig + boost autoreconfHook fuse libtorrentRasterbar curl ]; diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 2eb1888a85f8..c09fc0f7dc41 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -89,7 +89,8 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lgcc_s"; - buildInputs = [ pkgconfig glib cmake libXinerama ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib cmake libXinerama ] ++ optionals docsSupport [ docbook2x libxslt man less ] ++ optional ncursesSupport ncurses ++ optional x11Support xlibsWrapper diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index f04f6f897602..20b64907c22b 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; - buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap pkgconfig python ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap python ]; patchPhase = '' chmod +w ./scripts/gen-offsets.sh diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index 47f49a3da40b..ef8c55853a39 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-cryptsetup-reencrypt" "--with-crypto_backend=openssl" ] ++ stdenv.lib.optional enablePython "--enable-python"; - buildInputs = [ devicemapper openssl libuuid pkgconfig popt ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ devicemapper openssl libuuid popt ] ++ stdenv.lib.optional enablePython python2; meta = { diff --git a/pkgs/os-specific/linux/directvnc/default.nix b/pkgs/os-specific/linux/directvnc/default.nix index 4c47104c5b67..a63aceedee37 100644 --- a/pkgs/os-specific/linux/directvnc/default.nix +++ b/pkgs/os-specific/linux/directvnc/default.nix @@ -9,8 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1is9hca8an1b1n8436wkv7s08ml5lb95f7h9vznx9br597f106w9"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig directfb zlib libjpeg xproto + directfb zlib libjpeg xproto ]; meta = { diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index cf4f0386b499..e44a50233c34 100644 --- a/pkgs/os-specific/linux/dpdk/default.nix +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1w3nx5cqf8z600bdlbwz7brmdb5yn233qrqvv24kbmmxhbwp7qld"; }; - buildInputs = [ pkgconfig libvirt ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libvirt ]; RTE_KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; RTE_TARGET = "x86_64-native-linuxapp-gcc"; diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix index 9e61c377ecf9..091a0d4b46f4 100644 --- a/pkgs/os-specific/linux/eudev/default.nix +++ b/pkgs/os-specific/linux/eudev/default.nix @@ -8,13 +8,15 @@ let url="http://dev.gentoo.org/~blueness/eudev/eudev-${version}.tar.gz"; sha256 = "06gyyl90n85x8i7lfhns514y1kg1ians13l467admyzy3kjxkqsp"; }; + + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - glib pkgconfig gperf utillinux + glib gperf utillinux ]; in stdenv.mkDerivation { inherit (s) name version; - inherit buildInputs; + inherit nativeBuildInputs buildInputs; src = fetchurl { inherit (s) url sha256; }; diff --git a/pkgs/os-specific/linux/fbterm/default.nix b/pkgs/os-specific/linux/fbterm/default.nix index e97f911534a1..e7a540b6671e 100644 --- a/pkgs/os-specific/linux/fbterm/default.nix +++ b/pkgs/os-specific/linux/fbterm/default.nix @@ -9,7 +9,8 @@ let url="http://fbterm.googlecode.com/files/fbterm-1.7.0.tar.gz"; sha256="0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj"; }; - buildInputs = [gpm freetype fontconfig pkgconfig ncurses libx86]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [gpm freetype fontconfig ncurses libx86]; in stdenv.mkDerivation { inherit (s) name version; diff --git a/pkgs/os-specific/linux/firmware/fwupdate/default.nix b/pkgs/os-specific/linux/firmware/fwupdate/default.nix index ee94ad4226e1..f2bb9bddd578 100644 --- a/pkgs/os-specific/linux/firmware/fwupdate/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupdate/default.nix @@ -14,7 +14,8 @@ let version = "8"; in "TARGETDIR=$(out)/boot/efi/nixos/" "prefix=$(out)/" ]; - buildInputs = [ gnu-efi libsmbios popt pkgconfig gettext ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gnu-efi libsmbios popt gettext ]; propagatedBuildInputs = [ efivar ]; # TODO: Just apply the disable to the efi subdir hardeningDisable = [ "all" ]; diff --git a/pkgs/os-specific/linux/google-authenticator/default.nix b/pkgs/os-specific/linux/google-authenticator/default.nix index 119621d92781..1494d9f06a8a 100644 --- a/pkgs/os-specific/linux/google-authenticator/default.nix +++ b/pkgs/os-specific/linux/google-authenticator/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0wb95z5v1w4sk0p7y9pbn4v95w9hrbf80vw9k2z2sgs0156ljkb7"; }; - buildInputs = [ autoreconfHook pam ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ pam ]; preConfigure = '' sed -i "s|libqrencode.so.3|${qrencode}/lib/libqrencode.so.3|" src/google-authenticator.c diff --git a/pkgs/os-specific/linux/hal-flash/default.nix b/pkgs/os-specific/linux/hal-flash/default.nix index c385971104dd..a299fd0f4338 100644 --- a/pkgs/os-specific/linux/hal-flash/default.nix +++ b/pkgs/os-specific/linux/hal-flash/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "163pqy39cca8cnf8rm8zr63ndsnr7rki9pf9j7dl9gyxmi7sx88s"; }; - buildInputs = [ autoconf automake dbus glib libtool pkgconfig udisks2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake dbus glib libtool udisks2 ]; preConfigure = "libtoolize && aclocal && autoconf && automake --add-missing"; diff --git a/pkgs/os-specific/linux/ima-evm-utils/default.nix b/pkgs/os-specific/linux/ima-evm-utils/default.nix index c3730dd8de50..55bc80a173ea 100644 --- a/pkgs/os-specific/linux/ima-evm-utils/default.nix +++ b/pkgs/os-specific/linux/ima-evm-utils/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1h3rydnaswcmlradafpw8q18zj88bbziad2vb6gn0q7ydr48f3jm"; }; - buildInputs = [ autoreconfHook pkgconfig openssl attr keyutils asciidoc libxslt ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ openssl attr keyutils asciidoc libxslt ]; buildPhase = "make prefix=$out MANPAGE_DOCBOOK_XSL=${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl"; diff --git a/pkgs/os-specific/linux/iw/default.nix b/pkgs/os-specific/linux/iw/default.nix index 2a6294e3b5b9..ac064d9647a8 100644 --- a/pkgs/os-specific/linux/iw/default.nix +++ b/pkgs/os-specific/linux/iw/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1klpvv98bnx1zm6aqalnri2vd7w80scmdaxr2qnblb6mz82whk1j"; }; - buildInputs = [ libnl pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libnl ]; makeFlags = [ "PREFIX=\${out}" ]; diff --git a/pkgs/os-specific/linux/jool/cli.nix b/pkgs/os-specific/linux/jool/cli.nix index 6b79045ac67d..43edd8723a01 100644 --- a/pkgs/os-specific/linux/jool/cli.nix +++ b/pkgs/os-specific/linux/jool/cli.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation { sourceRoot = "Jool-v${sourceAttrs.version}-src/usr"; - buildInputs = [ autoreconfHook pkgconfig libnl ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ libnl ]; postPatch = '' chmod u+w -R ../common diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 6d04340ab46b..a528df26964b 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -245,6 +245,9 @@ with stdenv.lib; USB_SERIAL_KEYSPAN_USA49W y USB_SERIAL_KEYSPAN_USA49WLC y + # Device mapper (RAID, LVM, etc.) + MD y + # Filesystem options - in particular, enable extended attributes and # ACLs for all filesystems that support them. FANOTIFY y diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index f01f39289501..b64242e911db 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation { # perf refers both to newt and slang # binutils is required for libbfd. nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt - flex bison libiberty libaudit makeWrapper ]; - buildInputs = [ elfutils python perl newt slang pkgconfig libunwind binutils zlib ] ++ + flex bison libiberty libaudit makeWrapper pkgconfig ]; + buildInputs = [ elfutils python perl newt slang libunwind binutils zlib ] ++ stdenv.lib.optional withGtk gtk2; # Note: we don't add elfutils to buildInputs, since it provides a diff --git a/pkgs/os-specific/linux/latencytop/default.nix b/pkgs/os-specific/linux/latencytop/default.nix index 8c2badc3d686..93d2ac8b0312 100644 --- a/pkgs/os-specific/linux/latencytop/default.nix +++ b/pkgs/os-specific/linux/latencytop/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1vq3j9zdab6njly2wp900b3d5244mnxfm88j2bkiinbvxbxp4zwy"; }; - buildInputs = [ ncurses glib pkgconfig gtk2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ncurses glib gtk2 ]; meta = { homepage = http://latencytop.org; diff --git a/pkgs/os-specific/linux/libatasmart/default.nix b/pkgs/os-specific/linux/libatasmart/default.nix index 7fe0a2be10f5..81333ce790ed 100644 --- a/pkgs/os-specific/linux/libatasmart/default.nix +++ b/pkgs/os-specific/linux/libatasmart/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "138gvgdwk6h4ljrjsr09pxk1nrki4b155hqdzyr8mlk3bwsfmw31"; }; - buildInputs = [ pkgconfig udev ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ udev ]; meta = { homepage = http://0pointer.de/public/; diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix index c7da0fcca2a9..f20efcb32373 100644 --- a/pkgs/os-specific/linux/libselinux/default.nix +++ b/pkgs/os-specific/linux/libselinux/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { sha256 = "0yqg73ns97jwjh1iyv0jr5qxb8k5sqq5ywfkx11lzfn5yj8k0126"; }; - buildInputs = [ pkgconfig libsepol pcre ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libsepol pcre ] ++ optionals enablePython [ swig python ]; # Avoid this false warning: diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/os-specific/linux/libsmbios/default.nix index 9f71b4a1ed3d..98ec778e2c26 100644 --- a/pkgs/os-specific/linux/libsmbios/default.nix +++ b/pkgs/os-specific/linux/libsmbios/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation { sha256 = "0kvi36jrvhspyyq0pjfdyvzvimdn27fvbdpf429qm3xdmfi78y2j"; }; - buildInputs = [ pkgconfig libxml2 perl autoreconfHook doxygen ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ libxml2 perl doxygen ]; # It tries to install some Python stuff even when Python is disabled. installFlags = "pkgpythondir=$(TMPDIR)/python"; diff --git a/pkgs/os-specific/linux/miraclecast/default.nix b/pkgs/os-specific/linux/miraclecast/default.nix index 3d5a76144af5..0d79027d8b79 100644 --- a/pkgs/os-specific/linux/miraclecast/default.nix +++ b/pkgs/os-specific/linux/miraclecast/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { # INFO: It is important to list 'systemd' first as for now miraclecast # links against a customized systemd. Otherwise, a systemd package from # a propagatedBuildInput could take precedence. - buildInputs = [ systemd autoreconfHook pkgconfig udev glib readline ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ systemd udev glib readline ]; meta = { homepage = https://github.com/albfan/miraclecast; diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix index 58dc3a481737..4b5e7bbf3e3d 100644 --- a/pkgs/os-specific/linux/openvswitch/default.nix +++ b/pkgs/os-specific/linux/openvswitch/default.nix @@ -17,7 +17,8 @@ in stdenv.mkDerivation rec { kernel = optional (_kernel != null) _kernel.dev; - buildInputs = [ makeWrapper pkgconfig utillinux openssl libcap_ng python27 + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ makeWrapper utillinux openssl libcap_ng python27 perl procps which ]; configureFlags = [ diff --git a/pkgs/os-specific/linux/pam_mount/default.nix b/pkgs/os-specific/linux/pam_mount/default.nix index a4f52517df4b..dfcd53ec7786 100644 --- a/pkgs/os-specific/linux/pam_mount/default.nix +++ b/pkgs/os-specific/linux/pam_mount/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "091aq5zyc60wh21m1ryanjwknwxlaj9nvlswn5vjrmcdir5gnkm5"; }; - buildInputs = [ autoconf automake pkgconfig libtool pam libHX utillinux libxml2 pcre perl openssl cryptsetup ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake libtool pam libHX utillinux libxml2 pcre perl openssl cryptsetup ]; patches = [ ./insert_utillinux_path_hooks.patch ]; diff --git a/pkgs/os-specific/linux/rewritefs/default.nix b/pkgs/os-specific/linux/rewritefs/default.nix index 8ec46d64600a..3801036f9e57 100644 --- a/pkgs/os-specific/linux/rewritefs/default.nix +++ b/pkgs/os-specific/linux/rewritefs/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "15bcxprkxf0xqxljsqhb0jpi7p1vwqcb00sjs7nzrj7vh2p7mqla"; }; - buildInputs = [ pkgconfig fuse pcre ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fuse pcre ]; prePatch = '' # do not set sticky bit in nix store diff --git a/pkgs/os-specific/linux/rtkit/default.nix b/pkgs/os-specific/linux/rtkit/default.nix index fa3c2fc4c7e3..4fd716ab8db8 100644 --- a/pkgs/os-specific/linux/rtkit/default.nix +++ b/pkgs/os-specific/linux/rtkit/default.nix @@ -26,7 +26,8 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ pkgconfig dbus libcap ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ dbus libcap ]; meta = { homepage = http://0pointer.de/blog/projects/rtkit; diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index cd0c283edbb2..75fbacfb90ef 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -63,8 +63,8 @@ in assert buildKernel -> kernel != null; { splStable = common { - version = "0.7.1"; - sha256 = "0m8qhbdd8n40lbd91s30q4lrw8g169sha0410c8rwk2d5qfaxv9n"; + version = "0.7.2"; + sha256 = "10rq0npjlp09xjdgn9lc3wm310dqc71j0wgxwj92ncf9r61zf445"; }; splUnstable = common { diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index fdd5ada19cba..7c8ffef86eec 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -21,16 +21,19 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "man" "dev" ]; - buildInputs = - [ linuxHeaders pkgconfig intltool gperf libcap kmod xz pam acl - /* cryptsetup */ libuuid m4 glib libxslt libgcrypt libgpgerror - libmicrohttpd kexectools libseccomp libffi audit lz4 libapparmor - iptables gnu-efi + nativeBuildInputs = + [ pkgconfig intltool gperf libxslt /* FIXME: we may be able to prevent the following dependencies by generating an autoconf'd tarball, but that's probably not worth it. */ autoreconfHook gettext docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45 ]; + buildInputs = + [ linuxHeaders libcap kmod xz pam acl + /* cryptsetup */ libuuid m4 glib libgcrypt libgpgerror + libmicrohttpd kexectools libseccomp libffi audit lz4 libapparmor + iptables gnu-efi + ]; configureFlags = [ "--localstatedir=/var" diff --git a/pkgs/os-specific/linux/udisks-glue/default.nix b/pkgs/os-specific/linux/udisks-glue/default.nix index 2dfc8f1b5207..8b3ebd46c325 100644 --- a/pkgs/os-specific/linux/udisks-glue/default.nix +++ b/pkgs/os-specific/linux/udisks-glue/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "317d25bf249278dc8f6a5dcf18f760512427c772b9afe3cfe34e6e1baa258176"; }; - buildInputs = [ automake autoconf pkgconfig udisks dbus_glib glib confuse ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ automake autoconf udisks dbus_glib glib confuse ]; preConfigure = "sh autogen.sh"; diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix index 158ff2299b18..303d6bcdaa62 100644 --- a/pkgs/os-specific/linux/usbutils/default.nix +++ b/pkgs/os-specific/linux/usbutils/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "132clk14j4nm8crln2jymdbbc2vhzar2j2hnxyh05m79pbq1lx24"; }; - buildInputs = [ pkgconfig libusb1 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libusb1 ]; postInstall = '' diff --git a/pkgs/os-specific/linux/usermount/default.nix b/pkgs/os-specific/linux/usermount/default.nix index b00fc7296a01..94e5d998cd01 100644 --- a/pkgs/os-specific/linux/usermount/default.nix +++ b/pkgs/os-specific/linux/usermount/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation { sha256 = "0gpp0vwiwr7kgbhh26jspv3255662mnvnav6g8i2h0qxar8hf8w2"; }; - buildInputs = [ pkgconfig dbus libnotify udisks2 gdk_pixbuf ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ dbus libnotify udisks2 gdk_pixbuf ]; NIX_CFLAGS_COMPILE = [ "-DENABLE_NOTIFICATIONS" ]; diff --git a/pkgs/os-specific/linux/xsensors/default.nix b/pkgs/os-specific/linux/xsensors/default.nix index a392d065e419..5f7bca097bf6 100644 --- a/pkgs/os-specific/linux/xsensors/default.nix +++ b/pkgs/os-specific/linux/xsensors/default.nix @@ -7,8 +7,9 @@ stdenv.mkDerivation rec { url = "http://www.linuxhardware.org/xsensors/xsensors-${version}.tar.gz"; sha256 = "1siplsfgvcxamyqf44h71jx6jdfmvhfm7mh0y1q8ps4zs6pj2zwh"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gtk2 pkgconfig lm_sensors + gtk2 lm_sensors ]; patches = [ ./remove-unused-variables.patch diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 6ab9063d7194..dfcb3896244a 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -38,8 +38,9 @@ let patches = extraPatches; - buildInputs = [ autoreconfHook nukeReferences ] - ++ optionals buildKernel [ spl ] + nativeBuildInputs = [ autoreconfHook nukeReferences ]; + buildInputs = + optionals buildKernel [ spl ] ++ optionals buildUser [ zlib libuuid python attr ]; # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work @@ -138,9 +139,9 @@ in { incompatibleKernelVersion = null; # this package should point to the latest release. - version = "0.7.1"; + version = "0.7.2"; - sha256 = "0czal6lpl8igrhwmqh5jcgx07rlcgnrfg6ywzf681vsyh3gaxj9n"; + sha256 = "1dl6i4sg7z0k4p1dmfcm9arx62x30lqsr9hycvhhs3pf58ks8z2v"; extraPatches = [ (fetchpatch { |