diff options
author | Andreas Wiese <aw-nixos@meterriblecrew.net> | 2022-01-18 00:07:26 +0100 |
---|---|---|
committer | Andreas Wiese <aw-nixos@meterriblecrew.net> | 2022-01-21 00:17:55 +0100 |
commit | 64eac0ea11db33f062cebb680f5b6c1270c96de4 (patch) | |
tree | 8bd0a1fa50d11d26d77c9af1365f51878580a7aa | |
parent | 9ef57dfac71a134056e5eeb43fafb0277cc39fa6 (diff) | |
download | nixpkgs-64eac0ea11db33f062cebb680f5b6c1270c96de4.tar nixpkgs-64eac0ea11db33f062cebb680f5b6c1270c96de4.tar.gz nixpkgs-64eac0ea11db33f062cebb680f5b6c1270c96de4.tar.bz2 nixpkgs-64eac0ea11db33f062cebb680f5b6c1270c96de4.tar.lz nixpkgs-64eac0ea11db33f062cebb680f5b6c1270c96de4.tar.xz nixpkgs-64eac0ea11db33f062cebb680f5b6c1270c96de4.tar.zst nixpkgs-64eac0ea11db33f062cebb680f5b6c1270c96de4.zip |
geeqie: 1.6 -> 1.7.1
This especially fixes $ geeqie (geeqie:1879548): Gdk-ERROR **: 00:08:00.631: The program 'geeqie' received an X Window System error. This probably reflects a bug in the program. The error was 'BadValue (integer parameter out of range for operation)'. (Details: serial 209 error_code 2 request_code 152 (GLX) minor_code 24) (Note to programmers: normally, X errors are reported asynchronously; that is, you will receive the error a while after causing it. To debug your program, run it with the GDK_SYNCHRONIZE environment variable to change this behavior. You can then get a meaningful backtrace from your debugger if you break on the gdk_x_error() function.) zsh: trace trap (core dumped) geeqie $ which stems from some issue with clutter-gtk.
-rw-r--r-- | pkgs/applications/graphics/geeqie/default.nix | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index 299c335e76c..4ed4d257ba5 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -1,17 +1,17 @@ { lib, stdenv, fetchFromGitHub, pkg-config, autoconf, automake, gettext, intltool , gtk3, lcms2, exiv2, libchamplain, clutter-gtk, ffmpegthumbnailer, fbida -, wrapGAppsHook, fetchpatch +, wrapGAppsHook, fetchpatch, bash, doxygen }: stdenv.mkDerivation rec { pname = "geeqie"; - version = "1.6"; + version = "1.7.1"; src = fetchFromGitHub { owner = "BestImageViewer"; repo = "geeqie"; rev = "v${version}"; - sha256 = "sha256-fvqpimrtzNy2UStOw3qLfC8i8V1fSrmTTsvc1ihqPsU="; + sha256 = "sha256-0E1TeAhkiK+hFJ4oMoeZLvfRehTzdGF3AtEVwf/MaF8="; }; patches = [ @@ -23,11 +23,15 @@ stdenv.mkDerivation rec { }) ]; + postPatch = '' + patchShebangs . + ''; + preConfigure = "./autogen.sh"; nativeBuildInputs = [ pkg-config autoconf automake gettext intltool - wrapGAppsHook + wrapGAppsHook bash doxygen ]; buildInputs = [ @@ -59,7 +63,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; - homepage = "http://geeqie.sourceforge.net"; + homepage = "https://www.geeqie.org/"; maintainers = with maintainers; [ jfrankenau pSub markus1189 ]; platforms = platforms.gnu ++ platforms.linux; |