summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authorMaciej Krüger <mkg20001@gmail.com>2020-09-06 00:03:32 +0200
committerMaciej Krüger <mkg20001@gmail.com>2020-09-08 01:02:11 +0200
commit9e13c3be9cb16676bba367ab8857b08adc47b252 (patch)
treee13f32f285d871d91f1f6c9220387b738881afb5 /pkgs/desktops
parentb4abc9ba35929a2d09da2ce7fdb0925756f5abe3 (diff)
downloadnixpkgs-9e13c3be9cb16676bba367ab8857b08adc47b252.tar
nixpkgs-9e13c3be9cb16676bba367ab8857b08adc47b252.tar.gz
nixpkgs-9e13c3be9cb16676bba367ab8857b08adc47b252.tar.bz2
nixpkgs-9e13c3be9cb16676bba367ab8857b08adc47b252.tar.lz
nixpkgs-9e13c3be9cb16676bba367ab8857b08adc47b252.tar.xz
nixpkgs-9e13c3be9cb16676bba367ab8857b08adc47b252.tar.zst
nixpkgs-9e13c3be9cb16676bba367ab8857b08adc47b252.zip
cinnamon.muffin: 4.4.2 -> 4.6.3
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/cinnamon/muffin/default.nix19
1 files changed, 2 insertions, 17 deletions
diff --git a/pkgs/desktops/cinnamon/muffin/default.nix b/pkgs/desktops/cinnamon/muffin/default.nix
index 2913d4761ff..0ec60619502 100644
--- a/pkgs/desktops/cinnamon/muffin/default.nix
+++ b/pkgs/desktops/cinnamon/muffin/default.nix
@@ -35,30 +35,15 @@
 
 stdenv.mkDerivation rec {
   pname = "muffin";
-  version = "4.4.2";
+  version = "4.6.3";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    sha256 = "1kzjw4a5p69j8x55vpbpn6gy8pkbbyii6kzw2nzbypmipgnnijw8";
+    sha256 = "1p8irzf20wari1id5rfx5sypywih1jsrmn0f83zlyhc5fxg02r5p";
   };
 
-  patches = [
-    # backport patch that disables wayland components via build flags
-    # https://github.com/linuxmint/muffin/pull/548#issuecomment-578316820
-    (fetchpatch {
-      url = "https://github.com/linuxmint/muffin/commit/f78bf5b309b3d306848f47cc241b31e9399999a7.patch";
-      sha256 = "1c79aa9w2v23xlz86x3l42pavwrqx5d6nmfd9nms29hjsk8mpf4i";
-    })
-    # mute some warnings that caused build failures
-    # https://github.com/linuxmint/muffin/issues/535#issuecomment-536917143
-    (fetchpatch {
-      url = "https://src.fedoraproject.org/rpms/muffin/raw/6b0af3a22173e374804371a1cca74e23d696dd37/f/0001-fix-warnings-when-compiling.patch";
-      sha256 = "15wdbn3afn3103v7rq1icp8n0vqqwrrya03h0g2rzqlrsc7wrvzw";
-    })
-  ];
-
   buildInputs = [
     gtk3
     glib