diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-02-25 03:23:58 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-02-25 17:41:16 +0100 |
| commit | a31d98f3120e0f676303b7fc3e84424e6b325290 (patch) | |
| tree | 50eed3f28ebcae3fc1d7e6676d7446e8b55e2f53 /pkgs/development/libraries/libsoup | |
| parent | 20c5476a8bf09330e438f6d083bd4e197fefd17e (diff) | |
| download | nixpkgs-a31d98f3120e0f676303b7fc3e84424e6b325290.tar nixpkgs-a31d98f3120e0f676303b7fc3e84424e6b325290.tar.gz nixpkgs-a31d98f3120e0f676303b7fc3e84424e6b325290.tar.bz2 nixpkgs-a31d98f3120e0f676303b7fc3e84424e6b325290.tar.lz nixpkgs-a31d98f3120e0f676303b7fc3e84424e6b325290.tar.xz nixpkgs-a31d98f3120e0f676303b7fc3e84424e6b325290.tar.zst nixpkgs-a31d98f3120e0f676303b7fc3e84424e6b325290.zip | |
tree-wide: autorename gnome packages to use dashes
Diffstat (limited to 'pkgs/development/libraries/libsoup')
| -rw-r--r-- | pkgs/development/libraries/libsoup/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index e8d48bf668b..b67e41a0dc6 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, glib, libxml2, pkgconfig -, gnomeSupport ? true, libgnome_keyring3, sqlite, glib_networking, gobjectIntrospection +, gnomeSupport ? true, libgnome-keyring3, sqlite, glib-networking, gobjectIntrospection , valaSupport ? true, vala_0_38 , libintlOrEmpty , intltool, python }: @@ -37,10 +37,10 @@ stdenv.mkDerivation { ++ stdenv.lib.optionals valaSupport [ vala_0_38 ]; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib libxml2 gobjectIntrospection ] - ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring3 ]; - passthru.propagatedUserEnvPackages = [ glib_networking.out ]; + ++ stdenv.lib.optionals gnomeSupport [ libgnome-keyring3 ]; + passthru.propagatedUserEnvPackages = [ glib-networking.out ]; - # glib_networking is a runtime dependency, not a compile-time dependency + # glib-networking is a runtime dependency, not a compile-time dependency configureFlags = "--disable-tls-check" + " --enable-vala=${if valaSupport then "yes" else "no"}" + stdenv.lib.optionalString (!gnomeSupport) " --without-gnome"; |