summary refs log tree commit diff
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2021-07-18 18:19:20 +0800
committerBobby Rong <rjl931189261@126.com>2021-09-18 19:33:38 +0800
commite9facd8a4617897f4dc772b01459aed5d8610e9a (patch)
tree172783ec3aae9b6f0b1ca6d67742bede21b046b0
parenta13fd37777bc051dd71944e04d8de7b7649dc02b (diff)
downloadnixpkgs-e9facd8a4617897f4dc772b01459aed5d8610e9a.tar
nixpkgs-e9facd8a4617897f4dc772b01459aed5d8610e9a.tar.gz
nixpkgs-e9facd8a4617897f4dc772b01459aed5d8610e9a.tar.bz2
nixpkgs-e9facd8a4617897f4dc772b01459aed5d8610e9a.tar.lz
nixpkgs-e9facd8a4617897f4dc772b01459aed5d8610e9a.tar.xz
nixpkgs-e9facd8a4617897f4dc772b01459aed5d8610e9a.tar.zst
nixpkgs-e9facd8a4617897f4dc772b01459aed5d8610e9a.zip
pantheon.elementary-music: 5.1.0 -> 5.1.1
-rw-r--r--pkgs/desktops/pantheon/apps/elementary-music/default.nix18
1 files changed, 14 insertions, 4 deletions
diff --git a/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/pkgs/desktops/pantheon/apps/elementary-music/default.nix
index fe6c3f187fe..3a865967ac3 100644
--- a/pkgs/desktops/pantheon/apps/elementary-music/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-music/default.nix
@@ -1,5 +1,6 @@
 { lib, stdenv
 , fetchFromGitHub
+, fetchpatch
 , nix-update-script
 , pantheon
 , pkg-config
@@ -31,7 +32,7 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-music";
-  version = "5.1.0";
+  version = "5.1.1";
 
   repoName = "music";
 
@@ -39,9 +40,18 @@ stdenv.mkDerivation rec {
     owner = "elementary";
     repo = repoName;
     rev = version;
-    sha256 = "13v7rii9ardyd661s6d4hvvs4ig44v7s3qd1bx7imaigr72gg58b";
+    sha256 = "1wqsn4ss9acg0scaqpg514ll2dj3bl71wly4mm79qkinhy30yv9n";
   };
 
+  patches = [
+    # Upstream code not respecting our localedir
+    # https://github.com/elementary/music/pull/648
+    (fetchpatch {
+      url = "https://github.com/elementary/music/commit/aea97103d59afd213467403a48788e476e47c4c3.patch";
+      sha256 = "1ayj8l6lb19hhl9bhsdfbq7jgchfmpjx0qkljnld90czcksn95yx";
+    })
+  ];
+
   passthru = {
     updateScript = nix-update-script {
       attrPath = "pantheon.${pname}";
@@ -84,7 +94,7 @@ stdenv.mkDerivation rec {
   ];
 
   mesonFlags = [
-    "-Dplugins=lastfm,audioplayer,cdrom,ipod"
+    "-Dplugins=audioplayer,cdrom,ipod"
   ];
 
   postPatch = ''
@@ -95,7 +105,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Music player and library designed for elementary OS";
     homepage = "https://github.com/elementary/music";
-    license = licenses.lgpl2Plus;
+    license = licenses.gpl3Plus;
     platforms = platforms.linux;
     maintainers = pantheon.maintainers;
   };