about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2022-12-03 18:01:19 +0800
committerGitHub <noreply@github.com>2022-12-03 18:01:19 +0800
commit18ec6c809405963237fa74d27403dee04adbc876 (patch)
tree7298498589e17e4c66eea98b189ef50f51568b3a
parent49b8ad618e64d9fe9ab686817bfebe047860dcae (diff)
parentb3b6b3d564b959b7460dcdabc3a6a0f6e7c3fac6 (diff)
downloadnixlib-18ec6c809405963237fa74d27403dee04adbc876.tar
nixlib-18ec6c809405963237fa74d27403dee04adbc876.tar.gz
nixlib-18ec6c809405963237fa74d27403dee04adbc876.tar.bz2
nixlib-18ec6c809405963237fa74d27403dee04adbc876.tar.lz
nixlib-18ec6c809405963237fa74d27403dee04adbc876.tar.xz
nixlib-18ec6c809405963237fa74d27403dee04adbc876.tar.zst
nixlib-18ec6c809405963237fa74d27403dee04adbc876.zip
Merge pull request #204228 from bobby285271/pantheon
pantheon.elementary-screenshot: 6.0.2 -> 6.0.3
-rw-r--r--pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix14
1 files changed, 2 insertions, 12 deletions
diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix
index 48a68860dd94..8418091fb4fa 100644
--- a/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix
@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchpatch
 , nix-update-script
 , pkg-config
 , meson
@@ -19,24 +18,15 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-screenshot";
-  version = "6.0.2";
+  version = "6.0.3";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "screenshot";
     rev = version;
-    sha256 = "sha256-n+L08C/W5YnHZ5P3F1NGUYE2SH94sc4+kr1x+wXZ+cw=";
+    sha256 = "sha256-7BrowiMUDcf0raeOEFen2V3nenymgE6Rg5a3RilMQaI=";
   };
 
-  patches = [
-    # Fix build with meson 0.61
-    # https://github.com/elementary/screenshot/pull/241
-    (fetchpatch {
-      url = "https://github.com/elementary/screenshot/commit/80a5d942e813dd098e1ef0f6629b81d2ccef05ae.patch";
-      sha256 = "sha256-jOQuzUJvsjqytplLcW9BeIxzi9+/k2GFa4hHVZ3+wts=";
-    })
-  ];
-
   nativeBuildInputs = [
     desktop-file-utils
     meson