pyrox.dev
gupnp-tools: add required icons, rename from gupnptools
+11
-5
pkgs/tools/networking/gupnp-tools/default.nix
+11
-5
pkgs/tools/networking/gupnp-tools/default.nix
···
1
-
{fetchurl, stdenv, gupnp, gssdp, pkgconfig, gtk3, libuuid, intltool, gupnp_av, gnome3, makeWrapper}:
1
+
{fetchurl, stdenv, gupnp, gssdp, pkgconfig, gtk3, libuuid, intltool, gupnp_av, gnome3, gnome2, makeWrapper}:
2
2
3
3
stdenv.mkDerivation rec {
4
4
name = "gupnp-tools-${version}";
···
9
9
sha256 = "160dgh9pmlb85qfavwqz46lqawpshs8514bx2b57f9rbiny8kbij";
10
10
};
11
11
12
-
buildInputs = [gupnp libuuid gssdp pkgconfig gtk3 intltool gupnp_av
13
-
gnome3.defaultIconTheme gnome3.gnome_themes_standard makeWrapper];
12
+
buildInputs = [gupnp libuuid gssdp pkgconfig gtk3 intltool gupnp_av
13
+
gnome2.gnome_icon_theme makeWrapper];
14
14
15
15
postInstall = ''
16
-
wrapProgram "$out/bin/gupnp-av-cp" --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.defaultIconTheme}/share:$out/share"
17
-
wrapProgram "$out/bin/gupnp-universal-cp" --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.defaultIconTheme}/share:$out/share"
16
+
for program in gupnp-av-cp gupnp-universal-cp; do
17
+
wrapProgram "$out/bin/$program" \
18
+
--prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome2.gnome_icon_theme}/share:$out/share"
19
+
done
18
20
'';
21
+
22
+
meta = {
23
+
platforms = stdenv.lib.platforms.linux;
24
+
};
19
25
}
+2
-1
pkgs/top-level/all-packages.nix
+2
-1
pkgs/top-level/all-packages.nix
···
1805
1805
1806
1806
gupnp_igd = callPackage ../development/libraries/gupnp-igd {};
1807
1807
1808
-
gupnptools = callPackage ../tools/networking/gupnp-tools {};
1808
+
gupnp-tools = callPackage ../tools/networking/gupnp-tools {};
1809
1809
1810
1810
gvpe = callPackage ../tools/networking/gvpe { };
1811
1811
···
15856
15856
firefoxWrapper = firefox-wrapper;
15857
15857
fuse_exfat = exfat; # 2015-09-11
15858
15858
grantlee5 = qt5.grantlee; # added 2015-12-19
15859
+
gupnptools = gupnp-tools; # added 2015-12-19
15859
15860
htmlTidy = html-tidy; # added 2014-12-06
15860
15861
inherit (haskell.compiler) jhc uhc; # 2015-05-15
15861
15862
inotifyTools = inotify-tools;