summary refs log tree commit diff
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2023-09-03 08:50:40 +0000
committerBobby Rong <rjl931189261@126.com>2023-09-03 17:29:13 +0800
commite039ff1d45b776688d81483d13369ce868c7b119 (patch)
treea8ae99a4bbd2724b3cede9c5935725db992f6f9e
parentaa8aa7e2ea35ce655297e8322dc82bf77a31d04b (diff)
downloadnixpkgs-e039ff1d45b776688d81483d13369ce868c7b119.tar
nixpkgs-e039ff1d45b776688d81483d13369ce868c7b119.tar.gz
nixpkgs-e039ff1d45b776688d81483d13369ce868c7b119.tar.bz2
nixpkgs-e039ff1d45b776688d81483d13369ce868c7b119.tar.lz
nixpkgs-e039ff1d45b776688d81483d13369ce868c7b119.tar.xz
nixpkgs-e039ff1d45b776688d81483d13369ce868c7b119.tar.zst
nixpkgs-e039ff1d45b776688d81483d13369ce868c7b119.zip
gthumb: 3.12.2 → 3.12.3
https://gitlab.gnome.org/GNOME/gthumb/-/compare/3.12.2...3.12.3
-rw-r--r--pkgs/applications/graphics/gthumb/default.nix23
1 files changed, 4 insertions, 19 deletions
diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix
index 603d14b31dc..f0f796ed59f 100644
--- a/pkgs/applications/graphics/gthumb/default.nix
+++ b/pkgs/applications/graphics/gthumb/default.nix
@@ -1,7 +1,6 @@
 { stdenv
 , lib
 , fetchurl
-, fetchpatch
 , gnome
 , pkg-config
 , meson
@@ -20,6 +19,7 @@
 , libchamplain
 , librsvg
 , libwebp
+, libX11
 , json-glib
 , webkitgtk
 , lcms2
@@ -35,29 +35,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gthumb";
-  version = "3.12.2";
+  version = "3.12.3";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-l/iv5SJTUhZUHrvx47VG0Spr6zio8OuF8m5naTSq1CU=";
+    sha256 = "sha256-k9s11xQCxIoILVDPQIW7a4DkvVyLmxYaH3tRhBsQBxE=";
   };
 
-  patches = [
-    # Fix build with libraw 0.21, can be removed on next update
-    # https://hydra.nixos.org/build/209327709/nixlog/1
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/gthumb/-/commit/da0d3f22a5c3a141211d943e7d963d14090011ec.patch";
-      sha256 = "sha256-/l9US19rKxIUJjZ+oynGLr/9PKJPg9VUuA/VSuIT5AQ=";
-    })
-
-    # Fix build with exiv2 0.28, can be removed on next update
-    # https://gitlab.gnome.org/GNOME/gthumb/-/issues/282
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/gthumb/-/commit/3376550ae109286de09ce5f89e05060eb80230a7.patch";
-      sha256 = "sha256-zHX+kV7RaHXFqbR15RTaRcZJPU/P3uUj03tFUv0DR5o=";
-    })
-  ];
-
   nativeBuildInputs = [
     bison
     desktop-file-utils
@@ -93,6 +77,7 @@ stdenv.mkDerivation rec {
     libsoup
     libtiff
     libwebp
+    libX11
     webkitgtk
   ];