ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-23 05:37:27 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #100824 from markus1189/geeqie-1-5-1

Browse Source 
geeqie: 1.4.0 -> 1.5.1
This commit is contained in:
Sandro 2020-11-27 13:25:39 +01:00 committed by GitHub
commit 05d408e639
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/graphics/geeqie/default.nix
View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "geeqie"; pname = "geeqie";
version = "1.4"; version = "1.5.1";
src = fetchurl { src = fetchurl {
url = "http://geeqie.org/${pname}-${version}.tar.xz"; url = "http://geeqie.org/${pname}-${version}.tar.xz";
sha256 = "0ciygvcxb78pqg59r6p061mkbpvkgv2rv3r79j3kgv3kalb3ln2w"; sha256 = "02m1vqaasin249xx792cdj11xyag8lnanwzxd108y7y34g9xam28";
}; };
patches = [ patches = [
@ -19,12 +19,6 @@ stdenv.mkDerivation rec {
url = "https://src.fedoraproject.org/rpms/geeqie/raw/132fb04a1a5e74ddb333d2474f7edb9a39dc8d27/f/geeqie-1.4-goodbye-changelog.patch"; url = "https://src.fedoraproject.org/rpms/geeqie/raw/132fb04a1a5e74ddb333d2474f7edb9a39dc8d27/f/geeqie-1.4-goodbye-changelog.patch";
sha256 = "00a35dds44kjjdqsbbfk0x9y82jspvsbpm2makcm1ivzlhjjgszn"; sha256 = "00a35dds44kjjdqsbbfk0x9y82jspvsbpm2makcm1ivzlhjjgszn";
}) })
# Fixes build with exiv2 0.27.1
(fetchpatch {
name = "geeqie-exiv2-0.27.patch";
url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/geeqie-exiv2-0.27.patch?h=packages/geeqie&id=dee28a8b3e9039b9cd6927b5a93ef2a07cd8271d";
sha256 = "05skpbyp8pcq92psgijyccc8liwfy2cpwprw6m186pf454yb5y9p";
})
]; ];
preConfigure = "./autogen.sh"; preConfigure = "./autogen.sh";
@ -32,6 +26,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig autoconf automake gettext intltool nativeBuildInputs = [ pkgconfig autoconf automake gettext intltool
wrapGAppsHook wrapGAppsHook
]; ];
buildInputs = [ buildInputs = [
gtk3 lcms2 exiv2 libchamplain clutter-gtk ffmpegthumbnailer fbida gtk3 lcms2 exiv2 libchamplain clutter-gtk ffmpegthumbnailer fbida
]; ];
@ -63,7 +58,7 @@ stdenv.mkDerivation rec {
homepage = "http://geeqie.sourceforge.net"; homepage = "http://geeqie.sourceforge.net";
maintainers = with maintainers; [ jfrankenau pSub ]; maintainers = with maintainers; [ jfrankenau pSub markus1189 ];
platforms = platforms.gnu ++ platforms.linux; platforms = platforms.gnu ++ platforms.linux;
}; };
} }