easytag: use gnome defaultIconTheme

This commit is contained in:
Luca Bruno 2015-05-19 13:26:23 +02:00
parent 51412f96c0
commit 68bf202b65
2 changed files with 4 additions and 6 deletions

View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libid3tag, id3lib, taglib
, libvorbis, libogg, flac, itstool, libxml2, gsettings_desktop_schemas
, makeWrapper, gnome_icon_theme, dconf
, makeWrapper, gnome3
}:
stdenv.mkDerivation rec {
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
preFixup = ''
wrapProgram $out/bin/easytag \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" \
--prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules"
--prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"
'';
NIX_LDFLAGS = "-lid3tag -lz";
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper ];
buildInputs = [
pkgconfig intltool gtk3 glib libid3tag id3lib taglib libvorbis libogg flac
itstool libxml2 gsettings_desktop_schemas gnome_icon_theme dconf
itstool libxml2 gsettings_desktop_schemas gnome3.defaultIconTheme gnome3.dconf
];
meta = {

View File

@ -11615,9 +11615,7 @@ let
inherit (xlibs) libX11 xproto;
};
easytag = callPackage ../applications/audio/easytag {
inherit (gnome3) gnome_icon_theme dconf;
};
easytag = callPackage ../applications/audio/easytag { };
mp3gain = callPackage ../applications/audio/mp3gain { };