diff options
| -rw-r--r-- | pkgs/applications/audio/spotify/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 1a4f2bdd1b5b..fefab263065f 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -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/" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ea5d55a2817..a4d07741f1c1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17925,7 +17925,6 @@ with pkgs; }; spotify = callPackage ../applications/audio/spotify { - inherit (gnome2) GConf; libgcrypt = libgcrypt_1_5; libpng = libpng12; curl = curl.override { |