diff options
| author | Luca Bruno <lethalman88@gmail.com> | 2015-05-19 14:44:27 +0200 |
|---|---|---|
| committer | Luca Bruno <lethalman88@gmail.com> | 2015-05-19 14:44:27 +0200 |
| commit | 9adde87feae51574d0317cb6a9e0e60a40388466 (patch) | |
| tree | c4036981d06702922d4ab97438590e1375beaa4f /pkgs/tools/audio | |
| parent | 1b6401fd2e5de0b89dd181d0602e67036ec72c37 (diff) | |
| download | nixpkgs-9adde87feae51574d0317cb6a9e0e60a40388466.tar nixpkgs-9adde87feae51574d0317cb6a9e0e60a40388466.tar.gz nixpkgs-9adde87feae51574d0317cb6a9e0e60a40388466.tar.bz2 nixpkgs-9adde87feae51574d0317cb6a9e0e60a40388466.tar.lz nixpkgs-9adde87feae51574d0317cb6a9e0e60a40388466.tar.xz nixpkgs-9adde87feae51574d0317cb6a9e0e60a40388466.tar.zst nixpkgs-9adde87feae51574d0317cb6a9e0e60a40388466.zip | |
More usage of gnome3.defaultIconTheme
Diffstat (limited to 'pkgs/tools/audio')
| -rw-r--r-- | pkgs/tools/audio/gvolicon/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/audio/pasystray/default.nix | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix index 6bcddfa72f1..d885a6ac902 100644 --- a/pkgs/tools/audio/gvolicon/default.nix +++ b/pkgs/tools/audio/gvolicon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, alsaLib, pkgconfig, fetchgit, gnome3, hicolor_icon_theme, gdk_pixbuf, librsvg }: +{ stdenv, makeWrapper, alsaLib, pkgconfig, fetchgit, gnome3, gdk_pixbuf, librsvg }: stdenv.mkDerivation { name = "gvolicon"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; buildInputs = [ pkgconfig makeWrapper alsaLib gnome3.gtk ]; - propagatedBuildInputs = [ gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic hicolor_icon_theme gdk_pixbuf librsvg ]; + propagatedBuildInputs = [ gnome3.defaultIconTheme gdk_pixbuf librsvg ]; installPhase = '' make install PREFIX=$out wrapProgram "$out/bin/gvolicon" \ diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix index 42a2c9c3a12..0a378dbe36b 100644 --- a/pkgs/tools/audio/pasystray/default.nix +++ b/pkgs/tools/audio/pasystray/default.nix @@ -1,4 +1,5 @@ -{stdenv, fetchurl, unzip, autoconf, automake, makeWrapper, pkgconfig, gnome_icon_theme, avahi, gtk3, libnotify, pulseaudio, x11}: +{stdenv, fetchurl, unzip, autoconf, automake, makeWrapper, pkgconfig +, avahi, gtk3, libnotify, pulseaudio, x11}: stdenv.mkDerivation rec { name = "pasystray-0.4.0"; @@ -8,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1gpb7yqcxqglv50iqbkg2lg3r0z07jm4ir2zqmvns6sgddks590w"; }; - buildInputs = [ unzip autoconf automake makeWrapper pkgconfig gnome_icon_theme avahi gtk3 libnotify pulseaudio x11 ]; + buildInputs = [ unzip autoconf automake makeWrapper pkgconfig + gnome3.defaultIconTheme + avahi gtk3 libnotify pulseaudio x11 ]; preConfigure = '' aclocal @@ -19,7 +22,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/bin/pasystray" \ - --prefix XDG_DATA_DIRS : "${gnome_icon_theme}/share:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "${gnome3.defaultIconTheme}/share:$GSETTINGS_SCHEMAS_PATH" ''; meta = with stdenv.lib; { |