MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

spotify: remove/update gnome2 references

Browse source 
Part of #39976
This commit is contained in:
Patrick Hilhorst 2018-05-07 14:04:15 +02:00
parent ce0be6a725
commit fcb6a0a56e
No known key found for this signature in database
GPG key ID: 589BB0A8DAFEF2B2
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/applications/audio/spotify/default.nix
View file

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

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

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