diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-12-10 13:00:02 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-12-10 13:00:02 +0100 |
| commit | 089da3ee5c25f5d36d660d6c679cb0c963617fa7 (patch) | |
| tree | c21e0b5ec1b1daa2cb08d2a9fdb460aa13d10c7f /pkgs/applications/audio | |
| parent | db32c7ca8bf7daad6792c3e9597c68768aafd271 (diff) | |
| parent | 393dcd9c84e104ab7ff7e35f5612dc221e58d29b (diff) | |
| download | nixlib-089da3ee5c25f5d36d660d6c679cb0c963617fa7.tar nixlib-089da3ee5c25f5d36d660d6c679cb0c963617fa7.tar.gz nixlib-089da3ee5c25f5d36d660d6c679cb0c963617fa7.tar.bz2 nixlib-089da3ee5c25f5d36d660d6c679cb0c963617fa7.tar.lz nixlib-089da3ee5c25f5d36d660d6c679cb0c963617fa7.tar.xz nixlib-089da3ee5c25f5d36d660d6c679cb0c963617fa7.tar.zst nixlib-089da3ee5c25f5d36d660d6c679cb0c963617fa7.zip | |
Merge master into x-updates
Conflicts (simple): pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/applications/audio')
| -rw-r--r-- | pkgs/applications/audio/audacity/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/applications/audio/spotify/default.nix | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 4a6797f9010b..890497b0c992 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -4,12 +4,12 @@ }: stdenv.mkDerivation rec { - version = "2.0.4"; + version = "2.0.5"; name = "audacity-${version}"; src = fetchurl { url = "http://audacity.googlecode.com/files/audacity-minsrc-${version}.tar.xz"; - sha256 = "0pl92filykzs4g2pn7i02kdqgja326wjgafzw2vcgwn3dwrs4avp"; + sha256 = "0y9bvc3a3zxsk31yg7bha029mzkjiw5i9m86kbyj7x8ps0fm91z2"; }; preConfigure = /* we prefer system-wide libs */ '' @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { homepage = http://audacity.sourceforge.net; license = "GPLv2+"; platforms = with stdenv.lib.platforms; linux; + maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 615ee6a93cc9..874cc321f8be 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation { ln -s $out/spotify-client/spotify $out/bin/spotify patchelf \ --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ - --set-rpath $out/spotify-client/Data:$out/lib:$out/spotify-client:${stdenv.lib.makeLibraryPath [ xlibs.libXScrnSaver xlibs.libX11 qt4 alsaLib stdenv.gcc.gcc freetype glib pango cairo atk gdk_pixbuf gtk GConf cups sqlite]}:${stdenv.gcc.gcc}/lib64 \ + --set-rpath $out/spotify-client/Data:$out/lib:$out/spotify-client:${stdenv.lib.makeLibraryPath [ xlibs.libXScrnSaver xlibs.libX11 qt4 alsaLib stdenv.gcc.gcc freetype glib pango cairo atk gdk_pixbuf gtk GConf cups sqlite xlibs.libXdamage ]}:${stdenv.gcc.gcc}/lib64 \ $out/spotify-client/spotify dpkg-deb -x ${qt4webkit} ./ @@ -78,7 +78,7 @@ stdenv.mkDerivation { mkdir -p $out/libexec/spotify gcc -shared ${./preload.c} -o $preload -ldl -DOUT=\"$out\" -fPIC - wrapProgram $out/bin/spotify --set LD_PRELOAD $preload --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ GConf libpng cups libgcrypt sqlite gst_plugins_base gstreamer]}:$out/lib" + wrapProgram $out/bin/spotify --set LD_PRELOAD $preload --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ GConf libpng cups libgcrypt sqlite gst_plugins_base gstreamer xlibs.libXdamage ]}:$out/lib" # Desktop file mkdir -p "$out/share/applications/" |