summary refs log tree commit diff
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2022-03-28 22:52:26 +0800
committerBobby Rong <rjl931189261@126.com>2022-03-28 22:52:26 +0800
commitbcdb2fdee603dd13066f184b0fe6c2b744752428 (patch)
tree96ab4a5fb1e248368c2074192fdf18b0f6d33b01
parent14371cd82c212461ebe6bfef1ce501d226ba9e6b (diff)
downloadnixpkgs-bcdb2fdee603dd13066f184b0fe6c2b744752428.tar
nixpkgs-bcdb2fdee603dd13066f184b0fe6c2b744752428.tar.gz
nixpkgs-bcdb2fdee603dd13066f184b0fe6c2b744752428.tar.bz2
nixpkgs-bcdb2fdee603dd13066f184b0fe6c2b744752428.tar.lz
nixpkgs-bcdb2fdee603dd13066f184b0fe6c2b744752428.tar.xz
nixpkgs-bcdb2fdee603dd13066f184b0fe6c2b744752428.tar.zst
nixpkgs-bcdb2fdee603dd13066f184b0fe6c2b744752428.zip
mate.mate-backgrounds: fix build with meson 0.61
abstract/meson.build:3:5: ERROR: Function does not take positional arguments.
-rw-r--r--pkgs/desktops/mate/mate-backgrounds/default.nix11
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/desktops/mate/mate-backgrounds/default.nix b/pkgs/desktops/mate/mate-backgrounds/default.nix
index 9384d49e2a3..3076a7170cb 100644
--- a/pkgs/desktops/mate/mate-backgrounds/default.nix
+++ b/pkgs/desktops/mate/mate-backgrounds/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, meson, ninja, gettext, mateUpdateScript }:
+{ lib, stdenv, fetchurl, fetchpatch, meson, ninja, gettext, mateUpdateScript }:
 
 stdenv.mkDerivation rec {
   pname = "mate-backgrounds";
@@ -9,6 +9,15 @@ stdenv.mkDerivation rec {
     sha256 = "0379hngy3ap1r5kmqvmzs9r710k2c9nal2ps3hq765df4ir15j8d";
   };
 
+  patches = [
+    # Fix build with meson 0.61, can be removed on next update.
+    # https://github.com/mate-desktop/mate-backgrounds/pull/39
+    (fetchpatch {
+      url = "https://github.com/mate-desktop/mate-backgrounds/commit/0096e237d420e6247a75a1c6940a818e309ac2a7.patch";
+      sha256 = "HEF8VWunFO+NCG18fZA7lbE2l8pc6Z3jcD+rSZ1Jsqg=";
+    })
+  ];
+
   nativeBuildInputs = [
     gettext
     meson