diff options
author | Pascal Wittmann <mail@pascal-wittmann.de> | 2018-08-06 12:04:52 +0200 |
---|---|---|
committer | Pascal Wittmann <mail@pascal-wittmann.de> | 2018-08-06 12:04:52 +0200 |
commit | f7be21f4c98ba84e1b3eb7c77ecaed2fb82cce44 (patch) | |
tree | 5a7f8e0f97ec403b9aceb9276c8fb9e53bae9df5 /pkgs/applications/audio/spotify/default.nix | |
parent | 85afc926d8dfcbc079322594e803078d72a31f9f (diff) | |
parent | 6820e2f0dd16104961d6fc7e8e38846807159c4e (diff) | |
download | nixpkgs-f7be21f4c98ba84e1b3eb7c77ecaed2fb82cce44.tar nixpkgs-f7be21f4c98ba84e1b3eb7c77ecaed2fb82cce44.tar.gz nixpkgs-f7be21f4c98ba84e1b3eb7c77ecaed2fb82cce44.tar.bz2 nixpkgs-f7be21f4c98ba84e1b3eb7c77ecaed2fb82cce44.tar.lz nixpkgs-f7be21f4c98ba84e1b3eb7c77ecaed2fb82cce44.tar.xz nixpkgs-f7be21f4c98ba84e1b3eb7c77ecaed2fb82cce44.tar.zst nixpkgs-f7be21f4c98ba84e1b3eb7c77ecaed2fb82cce44.zip |
Merge branch 'master' into add-missing-licenses
Conflicts: pkgs/development/libraries/exiv2/default.nix Set license to gpl2Plus
Diffstat (limited to 'pkgs/applications/audio/spotify/default.nix')
-rw-r--r-- | pkgs/applications/audio/spotify/default.nix | 51 |
1 files changed, 41 insertions, 10 deletions
diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index b8495465db5..04bdff3c813 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -1,13 +1,18 @@ -{ fetchurl, stdenv, dpkg, xorg, alsaLib, makeWrapper, openssl, freetype +{ fetchurl, stdenv, squashfsTools, xorg, alsaLib, makeWrapper, openssl, freetype , glib, pango, cairo, atk, gdk_pixbuf, gtk2, cups, nspr, nss, libpng , libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_0_10, curl, zlib, gnome3 }: let - # Please update the stable branch! - # Latest version number can be found at: - # http://repository-origin.spotify.com/pool/non-free/s/spotify-client/ - # Be careful not to pick the testing version. - version = "1.0.80.480.g51b03ac3-13"; + # "rev" decides what is actually being downloaded + version = "1.0.80.474.gef6b503e-7"; + # To get the latest stable revision: + # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated' + # To get general information: + # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.' + # More exapmles of api usage: + # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py + rev = "16"; + deps = [ alsaLib @@ -49,12 +54,20 @@ in stdenv.mkDerivation { name = "spotify-${version}"; + # fetch from snapcraft instead of the debian repository most repos fetch from. + # That is a bit more cumbersome. But the debian repository only keeps the last + # two versions, while snapcraft should provide versions indefinately: + # https://forum.snapcraft.io/t/how-can-a-developer-remove-her-his-app-from-snap-store/512 + + # This is the next-best thing, since we're not allowed to re-distribute + # spotify ourselves: + # https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334 src = fetchurl { - url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "e32f4816ae79dbfa0c14086e76df3bc83d526402aac1dbba534127fc00fe50ea"; + url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap"; + sha512 = "45b7ab574b30fb368e0b6f4dd60addbfd1ddc02173b4f98b31c524eed49073432352a361e75959ce8e2f752231e93c79ca1b538c4bd295c935d1e2e0585d147f"; }; - buildInputs = [ dpkg makeWrapper ]; + buildInputs = [ squashfsTools makeWrapper ]; doConfigure = false; doBuild = false; @@ -63,7 +76,23 @@ stdenv.mkDerivation { unpackPhase = '' runHook preUnpack - dpkg-deb -x $src . + unsquashfs "$src" '/usr/share/spotify' '/usr/bin/spotify' '/meta/snap.yaml' + cd squashfs-root + if ! grep -q 'grade: stable' meta/snap.yaml; then + # Unfortunately this check is not reliable: At the moment (2018-07-26) the + # latest version in the "edge" channel is also marked as stable. + echo "The snap package is marked as unstable:" + grep 'grade: ' meta/snap.yaml + echo "You probably chose the wrong revision." + exit 1 + fi + if ! grep -q '${version}' meta/snap.yaml; then + echo "Package version differs from version found in snap metadata:" + grep 'version: ' meta/snap.yaml + echo "While the nix package specifies: ${version}." + echo "You probably chose the wrong revision or forgot to update the nix version." + exit 1 + fi runHook postUnpack ''; @@ -75,6 +104,8 @@ stdenv.mkDerivation { mkdir -p $libdir mv ./usr/* $out/ + cp meta/snap.yaml $out + # Work around Spotify referring to a specific minor version of # OpenSSL. |