diff options
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/networking/network-manager-applet/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/networking/openconnect/default.nix | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index 35678061b67..c0c4950f447 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { "--without-selinux" ]; + outputs = [ "out" "dev" ]; + buildInputs = [ gnome3.gtk libglade networkmanager libnotify libsecret gsettings_desktop_schemas polkit isocodes makeWrapper udev libgudev gnome3.gconf gnome3.libgnome_keyring diff --git a/pkgs/tools/networking/openconnect/default.nix b/pkgs/tools/networking/openconnect/default.nix index 5e38aee7f83..4fccb107771 100644 --- a/pkgs/tools/networking/openconnect/default.nix +++ b/pkgs/tools/networking/openconnect/default.nix @@ -1,10 +1,6 @@ { stdenv, fetchurl, pkgconfig, vpnc, openssl ? null, gnutls ? null, gmp, libxml2, stoken, zlib } : -let - xor = a: b: (a || b) && (!(a && b)); -in - -assert xor (openssl != null) (gnutls != null); +assert (openssl != null) == (gnutls == null); stdenv.mkDerivation rec { name = "openconnect-7.08"; @@ -16,6 +12,8 @@ stdenv.mkDerivation rec { sha256 = "00wacb79l2c45f94gxs63b9z25wlciarasvjrb8jb8566wgyqi0w"; }; + outputs = [ "out" "dev" ]; + preConfigure = '' export PKG_CONFIG=${pkgconfig}/bin/pkg-config export LIBXML2_CFLAGS="-I ${libxml2.dev}/include/libxml2" |