diff options
author | Andreas Rammhold <andreas@rammhold.de> | 2018-01-19 14:16:22 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-19 14:16:22 +0000 |
commit | a4edba9943586793b636b42e3610deba1ab3269c (patch) | |
tree | 4e503c9ede9116e3c90595226b31304b7337627a | |
parent | c5245efdfa82e067f8d33ab9892ff6ffb8582ecf (diff) | |
parent | a4d3c86e05cb26f7c5799025f4247471533239c2 (diff) | |
download | nixlib-a4edba9943586793b636b42e3610deba1ab3269c.tar nixlib-a4edba9943586793b636b42e3610deba1ab3269c.tar.gz nixlib-a4edba9943586793b636b42e3610deba1ab3269c.tar.bz2 nixlib-a4edba9943586793b636b42e3610deba1ab3269c.tar.lz nixlib-a4edba9943586793b636b42e3610deba1ab3269c.tar.xz nixlib-a4edba9943586793b636b42e3610deba1ab3269c.tar.zst nixlib-a4edba9943586793b636b42e3610deba1ab3269c.zip |
Merge pull request #34045 from andir/kmod-missing-libelf
Fix remaining 4.14 libelf outbreak
-rw-r--r-- | pkgs/misc/emulators/cdemu/vhba.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/phc-intel/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/v4l2loopback/default.nix | 1 | ||||
-rw-r--r-- | pkgs/servers/openafs-client/default.nix | 26 |
4 files changed, 6 insertions, 25 deletions
diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/misc/emulators/cdemu/vhba.nix index 1dd34fa23c33..081846f78e35 100644 --- a/pkgs/misc/emulators/cdemu/vhba.nix +++ b/pkgs/misc/emulators/cdemu/vhba.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ]; - buildInputs = [ libelf ]; + nativeBuildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/phc-intel/default.nix b/pkgs/os-specific/linux/phc-intel/default.nix index a766c2bb3b4a..81db8a9f26d0 100644 --- a/pkgs/os-specific/linux/phc-intel/default.nix +++ b/pkgs/os-specific/linux/phc-intel/default.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { name = "phc-intel-pack-${revbump}.tar.bz2"; }; - buildInputs = [ which ]; + nativeBuildInputs = [ which ] ++ kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix index 57f4b9ab6747..920c8c0bdee0 100644 --- a/pkgs/os-specific/linux/v4l2loopback/default.nix +++ b/pkgs/os-specific/linux/v4l2loopback/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { export PATH=${kmod}/sbin:$PATH ''; + nativeBuildInputs = kernel.moduleBuildDependencies; buildInputs = [ kmod ]; makeFlags = [ diff --git a/pkgs/servers/openafs-client/default.nix b/pkgs/servers/openafs-client/default.nix index 661888c5c5cc..232fb135bd80 100644 --- a/pkgs/servers/openafs-client/default.nix +++ b/pkgs/servers/openafs-client/default.nix @@ -3,39 +3,19 @@ stdenv.mkDerivation rec { name = "openafs-${version}-${kernel.version}"; - version = "1.6.21.1"; + version = "1.6.22.1"; src = fetchurl { url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2"; - sha256 = "0nisxnfl8nllcfmi7mxj1gngkpxd4jp1wapbkhz07qwqynq9dn5f"; + sha256 = "19nfbksw7b34jc3mxjk7cbz26zg9k5myhzpv2jf0fnmznr47jqaw"; }; - nativeBuildInputs = [ autoconf automake flex yacc perl which ]; + nativeBuildInputs = [ autoconf automake flex yacc perl which ] ++ kernel.moduleBuildDependencies; buildInputs = [ ncurses ]; hardeningDisable = [ "pic" ]; - patches = [ - (fetchpatch { - name = "fix-stdint-include.patch"; - url = "http://git.openafs.org/?p=openafs.git;a=patch;h=c193e5cba18273a062d4162118c7055b54f7eb5e"; - sha256 = "1yc4gygcazwsslf6mzk1ai92as5jbsjv7212jcbb2dw83jydhc09"; - }) - # linux 4.14 - (fetchpatch { - name = "test-for-__vfs_write-rather-than-__vfs_read.patch"; - url = "http://git.openafs.org/?p=openafs.git;a=patch;h=929e77a886fc9853ee292ba1aa52a920c454e94b"; - sha256 = "0g4jxqzvyrjy2q7mhxc5ikhypj3ljw1wri4lipzm66crsvycp9x5"; - }) - # linux 4.14 - (fetchpatch { - name = "use-kernel_read-kernel_write-when-__vfs-variants-are-unavailable.patch"; - url = "http://git.openafs.org/?p=openafs.git;a=patch;h=5ee516b3789d3545f3d78fb3aba2480308359945"; - sha256 = "1vx55qb120y857mn1l00i58fj9cckschp86ch3g6hqrdc5q5bxv2"; - }) - ]; - preConfigure = '' ln -s "${kernel.dev}/lib/modules/"*/build $TMP/linux |