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

Merge pull request #40116 from Synthetica9/spotify-nognome2

Browse Source 
spotify: Cleanup
This commit is contained in:
Jörg Thalheim 2018-05-07 13:46:57 +01:00 committed by GitHub
commit ddf902506e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
{ fetchurl, stdenv, dpkg, xorg, alsaLib, makeWrapper, openssl, freetype { fetchurl, stdenv, dpkg, xorg, alsaLib, makeWrapper, openssl, freetype
, glib, pango, cairo, atk, gdk_pixbuf, gtk2, cups, nspr, nss, libpng, GConf , glib, pango, cairo, atk, gdk_pixbuf, gtk2, cups, nspr, nss, libpng
, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_0_10, curl, zlib, gnome2 }: , libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_0_10, curl, zlib, gnome3 }:
let let
# Please update the stable branch! # Please update the stable branch!
@ -20,7 +20,6 @@ let
ffmpeg_0_10 ffmpeg_0_10
fontconfig fontconfig
freetype freetype
GConf
gdk_pixbuf gdk_pixbuf
glib glib
gtk2 gtk2
@ -93,7 +92,7 @@ stdenv.mkDerivation {
librarypath="${stdenv.lib.makeLibraryPath deps}:$libdir" librarypath="${stdenv.lib.makeLibraryPath deps}:$libdir"
wrapProgram $out/share/spotify/spotify \ wrapProgram $out/share/spotify/spotify \
--prefix LD_LIBRARY_PATH : "$librarypath" \ --prefix LD_LIBRARY_PATH : "$librarypath" \
--prefix PATH : "${gnome2.zenity}/bin" --prefix PATH : "${gnome3.zenity}/bin"
# Desktop file # Desktop file
mkdir -p "$out/share/applications/" mkdir -p "$out/share/applications/"

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

@ -17951,7 +17951,6 @@ with pkgs;
}; };
spotify = callPackage ../applications/audio/spotify { spotify = callPackage ../applications/audio/spotify {
inherit (gnome2) GConf;
libgcrypt = libgcrypt_1_5; libgcrypt = libgcrypt_1_5;
libpng = libpng12; libpng = libpng12;
curl = curl.override { curl = curl.override {