easytag: update from 2.2.4 to 2.3.1

Also cleanup: preConfigure seems to not be necessary, gtk2 support was
dropped, wrapping done so it doesn't crash at startup and icon theme
pulled in.
This commit is contained in:
Mateusz Kowalczyk 2014-11-01 00:56:22 +00:00
parent ba53392bce
commit 89d4c850f5
2 changed files with 15 additions and 13 deletions

View File

@ -1,28 +1,28 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk, glib, libid3tag, id3lib, taglib
, libvorbis, libogg, flac, itstool, libxml2
{ stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libid3tag, id3lib, taglib
, libvorbis, libogg, flac, itstool, libxml2, gsettings_desktop_schemas
, makeWrapper, gnome_icon_theme
}:
stdenv.mkDerivation rec {
name = "easytag-${version}";
version = "2.2.4";
version = "2.3.1";
src = fetchurl {
url = "mirror://gnome/sources/easytag/2.2/${name}.tar.xz";
sha256 = "14f0s0l28fwxnc37aw1imal2xcg9ykq35mx2j9gaqzz02ymjk0s5";
url = "mirror://gnome/sources/easytag/2.3/${name}.tar.xz";
sha256 = "19cdx4hma4nl38m1zrc3mq9cjg6knw970abk5anhg7cvpc1371s7";
};
preConfigure = ''
# pkg-config v0.23 should be enough.
sed -i -e '/_pkg_min_version=0.24/s/24/23/' \
-e 's/have_mp3=no/have_mp3=yes/' \
-e 's/ID3TAG_DEPS="id3tag"/ID3TAG_DEPS=""/' configure
preFixup = ''
wrapProgram $out/bin/easytag \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share"
'';
NIX_LDFLAGS = "-lid3tag -lz";
nativeBuildInputs = [ makeWrapper ];
buildInputs = [
pkgconfig intltool gtk glib libid3tag id3lib taglib libvorbis libogg flac
itstool libxml2
pkgconfig intltool gtk3 glib libid3tag id3lib taglib libvorbis libogg flac
itstool libxml2 gsettings_desktop_schemas gnome_icon_theme
];
meta = {

View File

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