diff options
| author | Pascal Wittmann <PascalWittmann@gmx.net> | 2016-01-04 17:16:41 +0100 |
|---|---|---|
| committer | Pascal Wittmann <PascalWittmann@gmx.net> | 2016-01-04 17:16:41 +0100 |
| commit | 192fda79e0519ac01372127114cb54d799e76492 (patch) | |
| tree | bfb059b2ddcaee137f7a8f9b68bef678f79ba2f4 /pkgs | |
| parent | 6d02d7e740396980cf4f36b3a623eea01155b6d2 (diff) | |
| parent | 62d2a91b2b99721caf338ad05ec4e1c410380fcf (diff) | |
| download | nixlib-192fda79e0519ac01372127114cb54d799e76492.tar nixlib-192fda79e0519ac01372127114cb54d799e76492.tar.gz nixlib-192fda79e0519ac01372127114cb54d799e76492.tar.bz2 nixlib-192fda79e0519ac01372127114cb54d799e76492.tar.lz nixlib-192fda79e0519ac01372127114cb54d799e76492.tar.xz nixlib-192fda79e0519ac01372127114cb54d799e76492.tar.zst nixlib-192fda79e0519ac01372127114cb54d799e76492.zip | |
Merge pull request #11832 from ktosiek/gupnp-tools-fixes
gupnp-tools: add required icons, rename from gupnptools
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/networking/gupnp-tools/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 13 insertions, 6 deletions
diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix index d0f2ef546691..af6eff5c31e9 100644 --- a/pkgs/tools/networking/gupnp-tools/default.nix +++ b/pkgs/tools/networking/gupnp-tools/default.nix @@ -1,4 +1,4 @@ -{fetchurl, stdenv, gupnp, gssdp, pkgconfig, gtk3, libuuid, intltool, gupnp_av, gnome3, makeWrapper}: +{fetchurl, stdenv, gupnp, gssdp, pkgconfig, gtk3, libuuid, intltool, gupnp_av, gnome3, gnome2, makeWrapper}: stdenv.mkDerivation rec { name = "gupnp-tools-${version}"; @@ -9,11 +9,17 @@ stdenv.mkDerivation rec { sha256 = "160dgh9pmlb85qfavwqz46lqawpshs8514bx2b57f9rbiny8kbij"; }; - buildInputs = [gupnp libuuid gssdp pkgconfig gtk3 intltool gupnp_av - gnome3.defaultIconTheme gnome3.gnome_themes_standard makeWrapper]; + buildInputs = [gupnp libuuid gssdp pkgconfig gtk3 intltool gupnp_av + gnome2.gnome_icon_theme makeWrapper]; postInstall = '' - wrapProgram "$out/bin/gupnp-av-cp" --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.defaultIconTheme}/share:$out/share" - wrapProgram "$out/bin/gupnp-universal-cp" --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.defaultIconTheme}/share:$out/share" + for program in gupnp-av-cp gupnp-universal-cp; do + wrapProgram "$out/bin/$program" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome2.gnome_icon_theme}/share:$out/share" + done ''; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d2542a72cd2..201bd4a27254 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1809,7 +1809,7 @@ let gupnp_igd = callPackage ../development/libraries/gupnp-igd {}; - gupnptools = callPackage ../tools/networking/gupnp-tools {}; + gupnp-tools = callPackage ../tools/networking/gupnp-tools {}; gvpe = callPackage ../tools/networking/gvpe { }; @@ -15862,6 +15862,7 @@ aliases = with self; rec { firefoxWrapper = firefox-wrapper; fuse_exfat = exfat; # 2015-09-11 grantlee5 = qt5.grantlee; # added 2015-12-19 + gupnptools = gupnp-tools; # added 2015-12-19 htmlTidy = html-tidy; # added 2014-12-06 inherit (haskell.compiler) jhc uhc; # 2015-05-15 inotifyTools = inotify-tools; |