diff options
| author | Yorick | 2022-11-02 11:27:31 +0100 |
|---|---|---|
| committer | GitHub | 2022-11-02 11:27:31 +0100 |
| commit | 3c86c4cea7ca63c147b31ce84fef3f0f280400c5 (patch) | |
| tree | 81c0da9eeb1d59e8850a9bb3418de4d1a9a79353 /pkgs | |
| parent | a704b9029586266f63807f64a6718f1a65b0f83b (diff) | |
| parent | 941367cba596628d37d22f32094173666307c0f4 (diff) | |
Merge pull request #190915 from LumiGuide/yorickvp/upstr-wgup
linuxPackages.wireguard: 1.0.20211208 -> 1.0.20220627, fix cross
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/wireguard/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index a47fb30c1b39..244092441b24 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -5,11 +5,11 @@ assert lib.versionOlder kernel.version "5.6"; stdenv.mkDerivation rec { pname = "wireguard"; - version = "1.0.20211208"; + version = "1.0.20220627"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz"; - sha256 = "sha256-MHC4ojhRD8IGwTUE8oEew8IVof9hQCC7CPgVQIBfBRQ="; + sha256 = "sha256-skbho3e49lZ/GLp/JDQpf/yXIEjes86aYtw/dn6e0Uo="; }; hardeningDisable = [ "pic" ]; @@ -20,6 +20,11 @@ stdenv.mkDerivation rec { preBuild = "cd src"; buildFlags = [ "module" ]; + makeFlags = [ + "ARCH=${stdenv.hostPlatform.linuxArch}" + ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ + "CROSS_COMPILE=${stdenv.cc.targetPrefix}" + ]; INSTALL_MOD_PATH = placeholder "out"; installFlags = [ "DEPMOD=true" ]; |