tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
connman: Fix comments after @erikarvstedt's comments
Doron Behar
5 years ago
cdc20ac3
ce502a41
+9
-9
2 changed files
expand all
collapse all
unified
split
pkgs
tools
networking
connman
default.nix
top-level
all-packages.nix
+6
-6
pkgs/tools/networking/connman/default.nix
···
8
, libmnl
9
, gnutls
10
, readline
11
-
# Choices one has to decide
12
, firewallType ? "iptables" # or "nftables"
13
, iptables ? null
14
, libnftnl ? null # for nftables
···
81
++ stdenv.lib.optionals (firewallType == "nftables") [ libnftnl ]
82
;
83
84
-
# Fix file program not found
85
preConfigure = ''
86
sed -i "s/\/usr\/bin\/file/file/g" ./configure
87
'';
···
99
# production build flags
100
"--disable-maintainer-mode"
101
"--enable-session-policy-local=builtin"
102
-
# This is for building and running tests (probably enabled by default),
103
-
# --enable-tests installs the tests as well
104
"--enable-tools"
105
]
106
++ stdenv.lib.optionals (!enableLoopback) [ "--disable-loopback" ]
···
108
++ stdenv.lib.optionals (!enableWireguard) [ "--disable-wireguard" ]
109
++ stdenv.lib.optionals (!enableGadget) [ "--disable-gadget" ]
110
++ stdenv.lib.optionals (!enableWifi) [ "--disable-wifi" ]
111
-
# We (almost) always turn on IWD support as it doesn't require any new dependencies
112
-
# and it's easier for the NixOS module to use only 1 connmand package when
113
# IWD is requested
114
++ stdenv.lib.optionals (enableWifi) [ "--enable-iwd" ]
115
++ stdenv.lib.optionals (!enableBluetooth) [ "--disable-bluetooth" ]
···
8
, libmnl
9
, gnutls
10
, readline
11
+
# configureable options
12
, firewallType ? "iptables" # or "nftables"
13
, iptables ? null
14
, libnftnl ? null # for nftables
···
81
++ stdenv.lib.optionals (firewallType == "nftables") [ libnftnl ]
82
;
83
84
+
# fix invalid path to 'file'
85
preConfigure = ''
86
sed -i "s/\/usr\/bin\/file/file/g" ./configure
87
'';
···
99
# production build flags
100
"--disable-maintainer-mode"
101
"--enable-session-policy-local=builtin"
102
+
# for building and running tests
103
+
# --enable-tests # installs the tests, we don't want that
104
"--enable-tools"
105
]
106
++ stdenv.lib.optionals (!enableLoopback) [ "--disable-loopback" ]
···
108
++ stdenv.lib.optionals (!enableWireguard) [ "--disable-wireguard" ]
109
++ stdenv.lib.optionals (!enableGadget) [ "--disable-gadget" ]
110
++ stdenv.lib.optionals (!enableWifi) [ "--disable-wifi" ]
111
+
# enable IWD support for wifi as it doesn't require any new dependencies
112
+
# and it's easier for the NixOS module to use only one connman package when
113
# IWD is requested
114
++ stdenv.lib.optionals (enableWifi) [ "--enable-iwd" ]
115
++ stdenv.lib.optionals (!enableBluetooth) [ "--disable-bluetooth" ]
+3
-3
pkgs/top-level/all-packages.nix
···
2559
enablePolkit = false;
2560
enablePptp = false;
2561
enableLoopback = false;
2562
-
# enableEthernet = false;
2563
enableWireguard = false;
2564
enableGadget = false;
2565
-
# enableWifi = false;
2566
enableBluetooth = false;
2567
enableOfono = false;
2568
enableDundee = false;
···
2572
enableTools = false;
2573
enableStats = false;
2574
enableClient = false;
2575
-
# enableDatafiles = false;
2576
};
2577
connmanFull = callPackage ../tools/networking/connman {
2578
enableNetworkManager = true;
···
2559
enablePolkit = false;
2560
enablePptp = false;
2561
enableLoopback = false;
2562
+
# enableEthernet = false; # If disabled no ethernet connection can be performed
2563
enableWireguard = false;
2564
enableGadget = false;
2565
+
# enableWifi = false; # If disabled no WiFi connection can be performed
2566
enableBluetooth = false;
2567
enableOfono = false;
2568
enableDundee = false;
···
2572
enableTools = false;
2573
enableStats = false;
2574
enableClient = false;
2575
+
# enableDatafiles = false; # If disabled, configuration and data files are not installed
2576
};
2577
connmanFull = callPackage ../tools/networking/connman {
2578
enableNetworkManager = true;