pyrox.dev
mullvad.openvpn-mullvad: Update configureFlags to match the flags from mullvadvpn-app-binaries on Linux too
authored by
TarCV
and committed by
+15
-8
pkgs/applications/networking/mullvad/openvpn.nix
+15
-8
pkgs/applications/networking/mullvad/openvpn.nix
···
1
{ lib
2
, openvpn
3
, fetchpatch
4
, fetchurl
5
, iproute2
6
, autoreconfHook
7
}:
8
9
openvpn.overrideAttrs (oldAttrs:
10
let
11
fetchMullvadPatch = { commit, sha256 }: fetchpatch {
12
url = "https://github.com/mullvad/openvpn/commit/${commit}.patch";
13
inherit sha256;
···
24
25
nativeBuildInputs = oldAttrs.nativeBuildInputs or [ ] ++ [
26
autoreconfHook
27
];
28
29
-
buildInputs = oldAttrs.buildInputs or [ ] ++ [
30
-
iproute2
31
-
];
32
33
-
configureFlags = oldAttrs.configureFlags or [ ] ++ [
34
# Flags are based on https://github.com/mullvad/mullvadvpn-app-binaries/blob/main/Makefile#L17
35
"--enable-static"
36
"--disable-shared"
···
46
"--disable-lzo"
47
"--disable-lz4"
48
"--enable-comp-stub"
49
-
50
-
# TODO: Use '--enable-dco --disable-iproute2' on Linux, see https://github.com/mullvad/mullvadvpn-app-binaries/blob/main/Makefile#L35
51
-
"--enable-iproute2"
52
-
"IPROUTE=${iproute2}/sbin/ip"
53
];
54
55
patches = oldAttrs.patches or [ ] ++ [
···
1
{ lib
2
+
, stdenv
3
, openvpn
4
, fetchpatch
5
, fetchurl
6
, iproute2
7
+
, libnl
8
, autoreconfHook
9
+
, pkg-config
10
}:
11
12
openvpn.overrideAttrs (oldAttrs:
13
let
14
+
inherit (lib) optional;
15
fetchMullvadPatch = { commit, sha256 }: fetchpatch {
16
url = "https://github.com/mullvad/openvpn/commit/${commit}.patch";
17
inherit sha256;
···
28
29
nativeBuildInputs = oldAttrs.nativeBuildInputs or [ ] ++ [
30
autoreconfHook
31
+
pkg-config
32
];
33
34
+
buildInputs = oldAttrs.buildInputs or [ ]
35
+
++ optional stdenv.isLinux [ libnl.dev ];
36
+
37
+
configureFlags = [
38
+
# Assignement instead of appending to make sure to use exactly the flags required by mullvad
39
40
# Flags are based on https://github.com/mullvad/mullvadvpn-app-binaries/blob/main/Makefile#L17
41
"--enable-static"
42
"--disable-shared"
···
52
"--disable-lzo"
53
"--disable-lz4"
54
"--enable-comp-stub"
55
+
]
56
+
++ optional stdenv.isLinux [
57
+
# Flags are based on https://github.com/mullvad/mullvadvpn-app-binaries/blob/main/Makefile#L35
58
+
"--enable-dco" # requires libnl
59
+
"--disable-iproute2"
60
];
61
62
patches = oldAttrs.patches or [ ] ++ [