diff options
| author | Yorick <yorick@yorickvanpelt.nl> | 2022-11-02 12:45:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-02 12:45:34 +0100 |
| commit | 3390a2b135554ea7ff3b6f26c006c3729a41df3b (patch) | |
| tree | 665d927edf36fb8ff89c6a98f17f49a3bcb49b0f | |
| parent | Merge pull request #198815 from NixOS/backport-198777-to-release-22.05 (diff) | |
| parent | linuxPackages_5_4.wireguard: fix cross build (diff) | |
| download | nixpkgs-3390a2b135554ea7ff3b6f26c006c3729a41df3b.tar.gz | |
Merge pull request #199141 from NixOS/backport-190915-to-release-22.05
[Backport release-22.05] linuxPackages.wireguard: 1.0.20211208 -> 1.0.20220627, fix cross
| -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" ]; |