diff options
| author | Peter Simons <simons@cryp.to> | 2013-12-10 00:25:54 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2013-12-10 00:25:54 +0100 |
| commit | 486e7736dfe0ca3b99a98b21bec8090d3e2df5d8 (patch) | |
| tree | 3364a88923232441475d51052a77ff36e51e09c6 /pkgs/applications/audio/spotify/default.nix | |
| parent | 4e385fcda73dd437152d42aefdde4bcb79d23c78 (diff) | |
| parent | 328d59eab6c2cdd94cb358d635fd6b4b64982e73 (diff) | |
| download | nixpkgs-486e7736dfe0ca3b99a98b21bec8090d3e2df5d8.tar nixpkgs-486e7736dfe0ca3b99a98b21bec8090d3e2df5d8.tar.gz nixpkgs-486e7736dfe0ca3b99a98b21bec8090d3e2df5d8.tar.bz2 nixpkgs-486e7736dfe0ca3b99a98b21bec8090d3e2df5d8.tar.lz nixpkgs-486e7736dfe0ca3b99a98b21bec8090d3e2df5d8.tar.xz nixpkgs-486e7736dfe0ca3b99a98b21bec8090d3e2df5d8.tar.zst nixpkgs-486e7736dfe0ca3b99a98b21bec8090d3e2df5d8.zip | |
Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts: pkgs/tools/networking/p2p/amule/default.nix
Diffstat (limited to 'pkgs/applications/audio/spotify/default.nix')
| -rw-r--r-- | pkgs/applications/audio/spotify/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 615ee6a93cc..874cc321f8b 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/" |