From da55e2c18620cff6aa316c450adc9557f8400fdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 4 Oct 2013 21:02:17 +0200 Subject: [PATCH] audacious: small update, fix crashes due to gsettings schemas Close #1037. --- pkgs/applications/audio/audacious/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index 6846607d61db..f9a8d0752415 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -1,28 +1,28 @@ { stdenv, fetchurl, pkgconfig, glib, gtk3, libmowgli, libmcs , gettext, dbus_glib, libxml2, libmad, xlibs, alsaLib, libogg -, libvorbis, libcdio, libcddb, flac, ffmpeg +, libvorbis, libcdio, libcddb, flac, ffmpeg, makeWrapper }: let - version = "3.3.4"; + version = "3.4.1"; in stdenv.mkDerivation { name = "audacious-${version}"; src = fetchurl { url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2"; - sha256 = "19zw4yj8g4fvxkv0ql8v8vgxzldxl1fzig239zzv88mpnvwxn737"; + sha256 = "0wf99b0nrk90fyak4gpwi076qnsrmv1j8958cvi57rxig21lvvap"; }; pluginsSrc = fetchurl { url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2"; - sha256 = "1l5g0zq73qp1hlrf4xsaj0n3hg0asrp7169531jgpncjn15dhvdn"; + sha256 = "02ivrxs6109nmmz9pkbf9dkm36s2lyp9vfv59sm0acxxd4db71md"; }; buildInputs = [ gettext pkgconfig glib gtk3 libmowgli libmcs libxml2 dbus_glib libmad xlibs.libXcomposite libogg libvorbis flac alsaLib libcdio - libcddb ffmpeg + libcddb ffmpeg makeWrapper ]; # Here we build bouth audacious and audacious-plugins in one @@ -44,7 +44,16 @@ stdenv.mkDerivation { src=$pluginsSrc genericBuild ) + + ( + source $stdenv/setup + # gsettings schemas for file dialogues + for file in "$out"/bin/*; do + wrapProgram "$file" --prefix XDG_DATA_DIRS : "$XDG_ADD" + done + ) ''; + XDG_ADD = gtk3 + "/share"; enableParallelBuilding = true;