From 4770987f921215a7cfc8f07e3dfef6787140055d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 11 Mar 2021 09:18:06 +0100 Subject: [PATCH 1/3] Revert "google-play-music-desktop-player: drop" This reverts commit aef2a70f67a6b051eb20b87d58f22ecd6ba63925. The package is still useful for YouTube Music. --- .../default.nix | 82 +++++++++++++++++++ pkgs/top-level/aliases.nix | 1 - pkgs/top-level/all-packages.nix | 4 + 3 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/audio/google-play-music-desktop-player/default.nix diff --git a/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/pkgs/applications/audio/google-play-music-desktop-player/default.nix new file mode 100644 index 00000000000..f86eed1d34d --- /dev/null +++ b/pkgs/applications/audio/google-play-music-desktop-player/default.nix @@ -0,0 +1,82 @@ +{ lib, stdenv, alsaLib, atk, at-spi2-atk, cairo, cups, dbus, dpkg, expat, fontconfig, freetype +, fetchurl, GConf, gdk-pixbuf, glib, gtk2, gtk3, libpulseaudio, makeWrapper, nspr +, nss, pango, udev, xorg +}: + +let + version = "4.7.1"; + + deps = [ + alsaLib + atk + at-spi2-atk + cairo + cups + dbus + expat + fontconfig + freetype + GConf + gdk-pixbuf + glib + gtk2 + gtk3 + libpulseaudio + nspr + nss + pango + stdenv.cc.cc + udev + xorg.libX11 + xorg.libxcb + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXScrnSaver + xorg.libXtst + ]; + +in + +stdenv.mkDerivation { + pname = "google-play-music-desktop-player"; + inherit version; + + src = fetchurl { + url = "https://github.com/MarshallOfSound/Google-Play-Music-Desktop-Player-UNOFFICIAL-/releases/download/v${version}/google-play-music-desktop-player_${version}_amd64.deb"; + sha256 = "1ljm9c5sv6wa7pa483yq03wq9j1h1jdh8363z5m2imz407yzgm5r"; + }; + + dontBuild = true; + nativeBuildInputs = [ dpkg makeWrapper ]; + + unpackPhase = '' + dpkg -x $src . + ''; + + installPhase = '' + mkdir -p $out + cp -r ./usr/share $out + cp -r ./usr/bin $out + + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + "$out/share/google-play-music-desktop-player/Google Play Music Desktop Player" + + wrapProgram $out/bin/google-play-music-desktop-player \ + --prefix LD_LIBRARY_PATH : "$out/share/google-play-music-desktop-player" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath deps}" + ''; + + meta = { + homepage = "https://www.googleplaymusicdesktopplayer.com/"; + description = "A beautiful cross platform Desktop Player for Google Play Music"; + license = lib.licenses.mit; + platforms = [ "x86_64-linux" ]; + maintainers = [ lib.maintainers.SuprDewd ]; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index da00ed76ca8..0138ac26a43 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -262,7 +262,6 @@ mapAliases ({ google-gflags = gflags; # added 2019-07-25 google-music-scripts = throw "google-music-scripts has been removed because Google Play Music was discontinued"; # added 2021-03-07 google-musicmanager = throw "google-musicmanager has been removed because Google Play Music was discontinued"; # added 2021-03-07 - google-play-music-desktop-player = throw "google-play-music-desktop-player has been removed because Google Play Music was discontinued"; # added 2021-03-07 googleAuthenticator = google-authenticator; # added 2016-10-16 grantlee5 = libsForQt5.grantlee; # added 2015-12-19 gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a47a94c08e7..64c588d393c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22849,6 +22849,10 @@ in google-chrome-dev = google-chrome.override { chromium = chromiumDev; channel = "dev"; }; + google-play-music-desktop-player = callPackage ../applications/audio/google-play-music-desktop-player { + inherit (gnome2) GConf; + }; + gosmore = callPackage ../applications/misc/gosmore { }; gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel { From 220b31d315f0fa1b346de206cd5bfef6dee0a07f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 11 Mar 2021 13:57:55 +0100 Subject: [PATCH 2/3] google-play-music-desktop-player: update description Co-authored-by: Sandro --- .../audio/google-play-music-desktop-player/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/pkgs/applications/audio/google-play-music-desktop-player/default.nix index f86eed1d34d..b62b070c3fd 100644 --- a/pkgs/applications/audio/google-play-music-desktop-player/default.nix +++ b/pkgs/applications/audio/google-play-music-desktop-player/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation { meta = { homepage = "https://www.googleplaymusicdesktopplayer.com/"; - description = "A beautiful cross platform Desktop Player for Google Play Music"; + description = "A beautiful cross platform Desktop Player for Google Play Music and YouTube Music"; license = lib.licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = [ lib.maintainers.SuprDewd ]; From 5c4410952a26ca315eea07a6bdd21a051974d15a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 11 Mar 2021 16:45:15 +0100 Subject: [PATCH 3/3] google-play-music-desktop-player: add anna328p as maintainer --- .../audio/google-play-music-desktop-player/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/pkgs/applications/audio/google-play-music-desktop-player/default.nix index b62b070c3fd..9d891d30234 100644 --- a/pkgs/applications/audio/google-play-music-desktop-player/default.nix +++ b/pkgs/applications/audio/google-play-music-desktop-player/default.nix @@ -77,6 +77,6 @@ stdenv.mkDerivation { description = "A beautiful cross platform Desktop Player for Google Play Music and YouTube Music"; license = lib.licenses.mit; platforms = [ "x86_64-linux" ]; - maintainers = [ lib.maintainers.SuprDewd ]; + maintainers = with lib.maintainers; [ anna328p SuprDewd ]; }; }