diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-09-20 14:52:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-20 14:52:12 -0400 |
| commit | 55d63efdc0cfc3c4b55281632deda30409e85b02 (patch) | |
| tree | 071ae82ec26ad599650af190a4e721bb6bfa9bd6 | |
| parent | 7cff0bc3eedb909d62d1dad79e71b37285fd9271 (diff) | |
| parent | 5acd6681f253c22ea58f63a38c41d1b338ed3105 (diff) | |
| download | nixpkgs-55d63efdc0cfc3c4b55281632deda30409e85b02.tar nixpkgs-55d63efdc0cfc3c4b55281632deda30409e85b02.tar.gz nixpkgs-55d63efdc0cfc3c4b55281632deda30409e85b02.tar.bz2 nixpkgs-55d63efdc0cfc3c4b55281632deda30409e85b02.tar.lz nixpkgs-55d63efdc0cfc3c4b55281632deda30409e85b02.tar.xz nixpkgs-55d63efdc0cfc3c4b55281632deda30409e85b02.tar.zst nixpkgs-55d63efdc0cfc3c4b55281632deda30409e85b02.zip | |
Merge pull request #69161 from artemist/openafs-linux_5_3
linuxPackages_5_3.openafs_1_8: fix build
| -rw-r--r-- | pkgs/servers/openafs/1.8/module.nix | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix index 95084458f47..d58d2bff813 100644 --- a/pkgs/servers/openafs/1.8/module.nix +++ b/pkgs/servers/openafs/1.8/module.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, which, autoconf, automake, flex, yacc -, kernel, glibc, perl, libtool_2, kerberos }: +, kernel, glibc, perl, libtool_2, kerberos, fetchpatch }: with (import ./srcs.nix { inherit fetchurl; }); @@ -11,6 +11,20 @@ in stdenv.mkDerivation { name = "openafs-${version}-${kernel.modDirVersion}"; inherit version src; + patches = [ + # Linux 5.3 + (fetchpatch { + name = "openafs_1_8-recurse-keyring_search.patch"; + url = "http://git.openafs.org/?p=openafs.git;a=patch;h=02d82275c17284d04629282aa374bb39f511c989"; + sha256 = "03pkldwf6i67yf6i1705qp18rx5b0b342ryda8vfjw9lnvpinygs"; + }) + (fetchpatch { + name = "openafs_1_8-send-sig.patch"; + url = "http://git.openafs.org/?p=openafs.git;a=patch;h=2b7af1243f46496c0b5973b3fa2a6396243f7613"; + sha256 = "13gyh5ncpp15dl7056gdzl5xhp2bmafc557bd2a4bwx9nyj53bag"; + }) + ]; + nativeBuildInputs = [ autoconf automake flex libtool_2 perl which yacc ] ++ kernel.moduleBuildDependencies; |