public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5436 from mcmtroffaes/feature/easytag-fix-gsettings

Browse Source 
easytag: Fix "Using the 'memory' GSettings backend" (see issue  #4415).
This commit is contained in:
lethalman 2014-12-22 16:14:01 +01:00
commit 74fbd2f676
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/audio/easytag/default.nix
View File

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

2
pkgs/top-level/all-packages.nix
View File

@ -10289,7 +10289,7 @@ let
}; };
easytag = callPackage ../applications/audio/easytag { easytag = callPackage ../applications/audio/easytag {
inherit (gnome3) gnome_icon_theme; inherit (gnome3) gnome_icon_theme dconf;
}; };
mp3gain = callPackage ../applications/audio/mp3gain { }; mp3gain = callPackage ../applications/audio/mp3gain { };