pyrox.dev
Merge pull request #103600 from erictapen/wireguard-linux-compat-20201112
linuxPackages.wireguard: 1.0.20200908 -> 1.0.20201112
authored by
Maximilian Bosch
and committed by
GitHub
e07fcb95
cc8a3b44
+2
-6
pkgs/os-specific/linux/wireguard/default.nix
+2
-6
pkgs/os-specific/linux/wireguard/default.nix
···
7
7
8
8
stdenv.mkDerivation rec {
9
9
pname = "wireguard";
10
-
version = "1.0.20200908";
10
+
version = "1.0.20201112";
11
11
12
12
src = fetchzip {
13
13
url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz";
14
-
sha256 = "1nd2kc3c62907kxm1084dw7krd8xsy3hxydmcpz4jvk03vm5dnkg";
14
+
sha256 = "sha256-HnYvjZ3VUH79NwNIvyTTygWYbVqEL2ttvlOlLiHhb5s=";
15
15
};
16
-
17
-
patches = [
18
-
./linux-5.4.76-fix.patch
19
-
];
20
16
21
17
hardeningDisable = [ "pic" ];
22
18
-12
pkgs/os-specific/linux/wireguard/linux-5.4.76-fix.patch
-12
pkgs/os-specific/linux/wireguard/linux-5.4.76-fix.patch
···
1
-
diff -u -r wireguard-linux-compat-1.0.20200908/src/compat/compat-asm.h wireguard-linux-compat-1.0.20200908-lts/src/compat/compat-asm.h
2
-
--- wireguard-linux-compat-1.0.20200908/src/compat/compat-asm.h 2020-09-08 16:22:40.000000000 +0000
3
-
+++ wireguard-linux-compat-1.0.20200908-lts/src/compat/compat-asm.h 2020-11-10 15:05:43.720093522 +0000
4
-
@@ -40,7 +40,7 @@
5
-
#undef pull
6
-
#endif
7
-
8
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0)
9
-
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 76)
10
-
#define SYM_FUNC_START ENTRY
11
-
#define SYM_FUNC_END ENDPROC
12
-
#endif