Skip to content

Commit

Permalink
audacious: small update, fix crashes due to gsettings schemas
Browse files Browse the repository at this point in the history
Close NixOS#1037.
  • Loading branch information
vcunat committed Oct 22, 2013
1 parent 4acb16a commit da55e2c
Showing 1 changed file with 14 additions and 5 deletions.
19 changes: 14 additions & 5 deletions pkgs/applications/audio/audacious/default.nix
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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;

Expand Down

0 comments on commit da55e2c

Please sign in to comment.