1 files changed, 12 insertions, 34 deletions
diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-music/default.nix
index f43234faa405..aafa2aea5200 100644
--- a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-music/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-music/default.nix
@@ -3,73 +3,51 @@
 , fetchFromGitHub
 , fetchpatch
 , nix-update-script
-, desktop-file-utils
 , meson
 , ninja
 , pkg-config
 , python3
 , vala
-, wrapGAppsHook
+, wrapGAppsHook4
 , glib
-, granite
+, granite7
 , gst_all_1
-, gtk3
-, libgda
-, libgee
-, libgpod
-, libhandy
-, libpeas
-, taglib
-, zeitgeist
+, gtk4
 }:
 
 stdenv.mkDerivation rec {
   pname = "elementary-music";
-  version = "5.1.1";
+  version = "7.0.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "music";
     rev = version;
-    sha256 = "1wqsn4ss9acg0scaqpg514ll2dj3bl71wly4mm79qkinhy30yv9n";
+    sha256 = "sha256-fZbOjZd6udJWM+jWXCmGwt6cyl/lXPsgM9XeTScbqts=";
   };
 
   patches = [
-    # Upstream code not respecting our localedir
-    # https://github.com/elementary/music/pull/648
+    # Use file basename for fallback audio object title
+    # https://github.com/elementary/music/pull/710
     (fetchpatch {
-      url = "https://github.com/elementary/music/commit/aea97103d59afd213467403a48788e476e47c4c3.patch";
-      sha256 = "1ayj8l6lb19hhl9bhsdfbq7jgchfmpjx0qkljnld90czcksn95yx";
-    })
-    # Fix build with meson 0.61
-    # https://github.com/elementary/music/pull/674
-    (fetchpatch {
-      url = "https://github.com/elementary/music/commit/fb3d840049c1e2e0bf8fdddea378a2db647dd096.patch";
-      sha256 = "sha256-tQZv7hZExLqbkGXahZxDfg7bkgwCKYbDholC2zuwlNw=";
+      url = "https://github.com/elementary/music/commit/97a437edc7652e0b85b7d3c6fd87089c14ec02e2.patch";
+      sha256 = "sha256-VmK5dKfSKWAIxfaKXsC8tjg6Pqq1XSGxJDQOZWJX92w=";
     })
   ];
 
   nativeBuildInputs = [
-    desktop-file-utils
     meson
     ninja
     pkg-config
     python3
     vala
-    wrapGAppsHook
+    wrapGAppsHook4
   ];
 
   buildInputs = [
     glib
-    granite
-    gtk3
-    libgda
-    libgee
-    libgpod
-    libhandy
-    libpeas
-    taglib
-    zeitgeist
+    granite7
+    gtk4
   ] ++ (with gst_all_1; [
     gst-plugins-bad
     gst-plugins-base