diff options
author | Luca Bruno <lethalman88@gmail.com> | 2015-05-19 13:26:23 +0200 |
---|---|---|
committer | Luca Bruno <lethalman88@gmail.com> | 2015-05-19 13:26:33 +0200 |
commit | 68bf202b6570e2b01e5c2b90449bb6559bbdda99 (patch) | |
tree | 83ac13f1e88170195205c15408da4cd3d3167eaa | |
parent | 51412f96c0b9a953559d7c8593cfeaf8588dbd86 (diff) | |
download | nixlib-68bf202b6570e2b01e5c2b90449bb6559bbdda99.tar nixlib-68bf202b6570e2b01e5c2b90449bb6559bbdda99.tar.gz nixlib-68bf202b6570e2b01e5c2b90449bb6559bbdda99.tar.bz2 nixlib-68bf202b6570e2b01e5c2b90449bb6559bbdda99.tar.lz nixlib-68bf202b6570e2b01e5c2b90449bb6559bbdda99.tar.xz nixlib-68bf202b6570e2b01e5c2b90449bb6559bbdda99.tar.zst nixlib-68bf202b6570e2b01e5c2b90449bb6559bbdda99.zip |
easytag: use gnome defaultIconTheme
-rw-r--r-- | pkgs/applications/audio/easytag/default.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix index 2d738f55c286..cb1def12dfd0 100644 --- a/pkgs/applications/audio/easytag/default.nix +++ b/pkgs/applications/audio/easytag/default.nix @@ -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 = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35d76ceb36ab..60b175e93fc8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |