diff options
| author | Domen Kožar <domen@dev.si> | 2014-01-30 10:06:05 -0800 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2014-01-30 10:06:05 -0800 |
| commit | 01ac8601009aa07b25405b0991485c69955eca86 (patch) | |
| tree | b130d597a5621b3bf18a79f3ef7446e85c2202f2 /pkgs/top-level | |
| parent | cdd86c7875c7e31b69d1a859c0f8c6a9deb3266f (diff) | |
| parent | 13d11227f1e68f55b1365c39c0e91bcc4371735e (diff) | |
| download | nixlib-01ac8601009aa07b25405b0991485c69955eca86.tar nixlib-01ac8601009aa07b25405b0991485c69955eca86.tar.gz nixlib-01ac8601009aa07b25405b0991485c69955eca86.tar.bz2 nixlib-01ac8601009aa07b25405b0991485c69955eca86.tar.lz nixlib-01ac8601009aa07b25405b0991485c69955eca86.tar.xz nixlib-01ac8601009aa07b25405b0991485c69955eca86.tar.zst nixlib-01ac8601009aa07b25405b0991485c69955eca86.zip | |
Merge pull request #1496 from bennofs/fix-gupnp-tools
gupnp-tools and releated packages: fix and update
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 22cf0c516807..6b28eb79073e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1101,11 +1101,11 @@ let inherit (gnome) libsoup; }; + gupnp_av = callPackage ../development/libraries/gupnp-av {}; + gupnp_igd = callPackage ../development/libraries/gupnp-igd {}; - gupnptools = callPackage ../tools/networking/gupnp-tools { - inherit (gnome) libsoup libglade gnomeicontheme; - }; + gupnptools = callPackage ../tools/networking/gupnp-tools {}; gvpe = builderDefsPackage ../tools/networking/gvpe { inherit openssl gmp nettools iproute; @@ -4120,9 +4120,7 @@ let geoclue = callPackage ../development/libraries/geoclue {}; - geoclue2 = callPackage ../development/libraries/geoclue/2.0.nix { - libsoup = libsoup_2_44; - }; + geoclue2 = callPackage ../development/libraries/geoclue/2.0.nix {}; geoip = builderDefsPackage ../development/libraries/geoip { inherit zlib; @@ -4928,7 +4926,6 @@ let libsodium = callPackage ../development/libraries/libsodium { }; libsoup = callPackage ../development/libraries/libsoup { }; - libsoup_2_44 = callPackage ../development/libraries/libsoup/2.44.nix { }; libssh = callPackage ../development/libraries/libssh { }; @@ -5734,7 +5731,6 @@ let }; webkitgtk = callPackage ../development/libraries/webkitgtk { - libsoup = libsoup_2_44; harfbuzz = harfbuzz.override { withIcu = true; }; |