public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

connman: Fix comments after @erikarvstedt's comments

Browse Source
This commit is contained in:
Doron Behar 2020-03-02 00:49:36 +02:00
parent ce502a41eb
commit cdc20ac30e
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/tools/networking/connman/default.nix
View File

@ -8,7 +8,7 @@
, libmnl , libmnl
, gnutls , gnutls
, readline , readline
# Choices one has to decide # configureable options
, firewallType ? "iptables" # or "nftables" , firewallType ? "iptables" # or "nftables"
, iptables ? null , iptables ? null
, libnftnl ? null # for nftables , libnftnl ? null # for nftables
@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optionals (firewallType == "nftables") [ libnftnl ] ++ stdenv.lib.optionals (firewallType == "nftables") [ libnftnl ]
; ;
# Fix file program not found # fix invalid path to 'file'
preConfigure = '' preConfigure = ''
sed -i "s/\/usr\/bin\/file/file/g" ./configure sed -i "s/\/usr\/bin\/file/file/g" ./configure
''; '';
@ -99,8 +99,8 @@ stdenv.mkDerivation rec {
# production build flags # production build flags
"--disable-maintainer-mode" "--disable-maintainer-mode"
"--enable-session-policy-local=builtin" "--enable-session-policy-local=builtin"
# This is for building and running tests (probably enabled by default), # for building and running tests
# --enable-tests installs the tests as well # --enable-tests # installs the tests, we don't want that
"--enable-tools" "--enable-tools"
] ]
++ stdenv.lib.optionals (!enableLoopback) [ "--disable-loopback" ] ++ stdenv.lib.optionals (!enableLoopback) [ "--disable-loopback" ]
@ -108,8 +108,8 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optionals (!enableWireguard) [ "--disable-wireguard" ] ++ stdenv.lib.optionals (!enableWireguard) [ "--disable-wireguard" ]
++ stdenv.lib.optionals (!enableGadget) [ "--disable-gadget" ] ++ stdenv.lib.optionals (!enableGadget) [ "--disable-gadget" ]
++ stdenv.lib.optionals (!enableWifi) [ "--disable-wifi" ] ++ stdenv.lib.optionals (!enableWifi) [ "--disable-wifi" ]
# We (almost) always turn on IWD support as it doesn't require any new dependencies # enable IWD support for wifi as it doesn't require any new dependencies
# and it's easier for the NixOS module to use only 1 connmand package when # and it's easier for the NixOS module to use only one connman package when
# IWD is requested # IWD is requested
++ stdenv.lib.optionals (enableWifi) [ "--enable-iwd" ] ++ stdenv.lib.optionals (enableWifi) [ "--enable-iwd" ]
++ stdenv.lib.optionals (!enableBluetooth) [ "--disable-bluetooth" ] ++ stdenv.lib.optionals (!enableBluetooth) [ "--disable-bluetooth" ]

6
pkgs/top-level/all-packages.nix
View File

@ -2559,10 +2559,10 @@ in
enablePolkit = false; enablePolkit = false;
enablePptp = false; enablePptp = false;
enableLoopback = false; enableLoopback = false;
# enableEthernet = false; # enableEthernet = false; # If disabled no ethernet connection can be performed
enableWireguard = false; enableWireguard = false;
enableGadget = false; enableGadget = false;
# enableWifi = false; # enableWifi = false; # If disabled no WiFi connection can be performed
enableBluetooth = false; enableBluetooth = false;
enableOfono = false; enableOfono = false;
enableDundee = false; enableDundee = false;
@ -2572,7 +2572,7 @@ in
enableTools = false; enableTools = false;
enableStats = false; enableStats = false;
enableClient = false; enableClient = false;
# enableDatafiles = false; # enableDatafiles = false; # If disabled, configuration and data files are not installed
}; };
connmanFull = callPackage ../tools/networking/connman { connmanFull = callPackage ../tools/networking/connman {
enableNetworkManager = true; enableNetworkManager = true;