diff options
author | Jörg Thalheim <joerg@thalheim.io> | 2020-04-25 07:19:26 +0100 |
---|---|---|
committer | Jörg Thalheim <joerg@thalheim.io> | 2020-04-25 11:16:10 +0100 |
commit | 21ec1f5eadc5f6ca8b0b6599eda3dcf59629f1f0 (patch) | |
tree | 84fa62b74a1b0ff91f9ba479d630c776c730a671 /pkgs/os-specific/linux/wireguard | |
parent | 77dc7ef908142a11d507c034e33edc1112be7187 (diff) | |
download | nixpkgs-21ec1f5eadc5f6ca8b0b6599eda3dcf59629f1f0.tar nixpkgs-21ec1f5eadc5f6ca8b0b6599eda3dcf59629f1f0.tar.gz nixpkgs-21ec1f5eadc5f6ca8b0b6599eda3dcf59629f1f0.tar.bz2 nixpkgs-21ec1f5eadc5f6ca8b0b6599eda3dcf59629f1f0.tar.lz nixpkgs-21ec1f5eadc5f6ca8b0b6599eda3dcf59629f1f0.tar.xz nixpkgs-21ec1f5eadc5f6ca8b0b6599eda3dcf59629f1f0.tar.zst nixpkgs-21ec1f5eadc5f6ca8b0b6599eda3dcf59629f1f0.zip |
wireguard: 1.0.20200401 -> 1.0.20200413
Diffstat (limited to 'pkgs/os-specific/linux/wireguard')
-rw-r--r-- | pkgs/os-specific/linux/wireguard/default.nix | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 890c774081b..6edbb1aa4d7 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, kernel, perl, wireguard-tools }: +{ stdenv, fetchzip, kernel, perl, wireguard-tools, bc }: # module requires Linux >= 3.10 https://www.wireguard.io/install/#kernel-requirements assert stdenv.lib.versionAtLeast kernel.version "3.10"; @@ -7,29 +7,31 @@ assert stdenv.lib.versionOlder kernel.version "5.6"; stdenv.mkDerivation rec { pname = "wireguard"; - version = "1.0.20200401"; + version = "1.0.20200413"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz"; - sha256 = "1q4gfpbvbyracnl219xqfz5yqfc08i6g41z6bn2skx5x8jbll3aq"; + sha256 = "11dpw1inszbc3qjcfnap74kgjxkyyrx90vxv6wmsgkbp8lsl4p66"; }; - preConfigure = '' - cd src - sed -i '/depmod/,+1d' Makefile - ''; - hardeningDisable = [ "pic" ]; KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; - INSTALL_MOD_PATH = "\${out}"; - - NIX_CFLAGS = ["-Wno-error=cpp"]; - nativeBuildInputs = [ perl ] ++ kernel.moduleBuildDependencies; + nativeBuildInputs = [ perl bc ] ++ kernel.moduleBuildDependencies; + preBuild = "cd src"; buildFlags = [ "module" ]; - installTargets = [ "module-install" ]; + + INSTALL_MOD_PATH = placeholder "out"; + installFlags = [ "DEPMOD=true" ]; + enableParallelBuilding = true; + + passthru = { + # remove this when our kernel comes with native wireguard support + # and our tests no longer tests this package + inherit (wireguard-tools) tests; + }; meta = with stdenv.lib; { inherit (wireguard-tools.meta) homepage license maintainers; |