diff options
| author | Doron Behar <doron.behar@gmail.com> | 2021-11-04 14:29:41 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-04 14:29:41 +0000 |
| commit | ae9a94b44a52467ebe1978d555d0682560875143 (patch) | |
| tree | ed34649af9af238f19f13e39e64433b09cf234bc | |
| parent | f37f1b2d01591480469773e99c7411f5ac001cf3 (diff) | |
| parent | e76aa52b2f4293526709b4d9b93fb5f2564d23ed (diff) | |
| download | nixpkgs-ae9a94b44a52467ebe1978d555d0682560875143.tar nixpkgs-ae9a94b44a52467ebe1978d555d0682560875143.tar.gz nixpkgs-ae9a94b44a52467ebe1978d555d0682560875143.tar.bz2 nixpkgs-ae9a94b44a52467ebe1978d555d0682560875143.tar.lz nixpkgs-ae9a94b44a52467ebe1978d555d0682560875143.tar.xz nixpkgs-ae9a94b44a52467ebe1978d555d0682560875143.tar.zst nixpkgs-ae9a94b44a52467ebe1978d555d0682560875143.zip | |
Merge pull request #144512 from alyssais/connman-cross
| -rw-r--r-- | pkgs/tools/networking/connman/connman.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/tools/networking/connman/connman.nix b/pkgs/tools/networking/connman/connman.nix index 3ec9bce0b4c..311fffb4087 100644 --- a/pkgs/tools/networking/connman/connman.nix +++ b/pkgs/tools/networking/connman/connman.nix @@ -67,17 +67,17 @@ stdenv.mkDerivation rec { libmnl gnutls readline - ] ++ optionals (enableOpenconnect) [ openconnect ]; + ] ++ optionals (enableOpenconnect) [ openconnect ] + ++ optionals (firewallType == "iptables") [ iptables ] + ++ optionals (firewallType == "nftables") [ libnftnl ] + ++ optionals (enablePolkit) [ polkit ] + ++ optionals (enablePptp) [ pptp ppp ] + ; nativeBuildInputs = [ pkg-config file - ] - ++ optionals (enablePolkit) [ polkit ] - ++ optionals (enablePptp) [ pptp ppp ] - ++ optionals (firewallType == "iptables") [ iptables ] - ++ optionals (firewallType == "nftables") [ libnftnl ] - ; + ]; # fix invalid path to 'file' postPatch = '' |