JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #34045 from andir/kmod-missing-libelf

Browse Source 
Fix remaining 4.14 libelf outbreak
This commit is contained in:
Andreas Rammhold 2018-01-19 14:16:22 +00:00 committed by GitHub
commit a4edba9943
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/misc/emulators/cdemu/vhba.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
}; };
makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ]; makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ];
buildInputs = [ libelf ]; nativeBuildInputs = kernel.moduleBuildDependencies;
hardeningDisable = [ "pic" ]; hardeningDisable = [ "pic" ];

2
pkgs/os-specific/linux/phc-intel/default.nix
View File

@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
name = "phc-intel-pack-${revbump}.tar.bz2"; name = "phc-intel-pack-${revbump}.tar.bz2";
}; };
buildInputs = [ which ]; nativeBuildInputs = [ which ] ++ kernel.moduleBuildDependencies;
hardeningDisable = [ "pic" ]; hardeningDisable = [ "pic" ];

1
pkgs/os-specific/linux/v4l2loopback/default.nix
View File

@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
export PATH=${kmod}/sbin:$PATH export PATH=${kmod}/sbin:$PATH
''; '';
nativeBuildInputs = kernel.moduleBuildDependencies;
buildInputs = [ kmod ]; buildInputs = [ kmod ];
makeFlags = [ makeFlags = [

26
pkgs/servers/openafs-client/default.nix
View File

@ -3,39 +3,19 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "openafs-${version}-${kernel.version}"; name = "openafs-${version}-${kernel.version}";
version = "1.6.21.1"; version = "1.6.22.1";
src = fetchurl { src = fetchurl {
url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2"; 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 ]; buildInputs = [ ncurses ];
hardeningDisable = [ "pic" ]; 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 = '' preConfigure = ''
ln -s "${kernel.dev}/lib/modules/"*/build $TMP/linux ln -s "${kernel.dev}/lib/modules/"*/build $TMP/linux