Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3aa8f9448cfd
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 636f1f08b0a1
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jun 16, 2019

  1. gthumb: 3.6.2 -> 3.8.0

    * enable clutter-gtk support
      Upstream defaults to it so we probably should as well.
    worldofpeace committed Jun 16, 2019
    Copy the full SHA
    5141948 View commit details
  2. Merge pull request #63180 from worldofpeace/gthumb/3.8.0

    gthumb: 3.6.2 -> 3.8.0
    worldofpeace authored Jun 16, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    636f1f0 View commit details
Showing with 77 additions and 16 deletions.
  1. +77 −16 pkgs/applications/graphics/gthumb/default.nix
93 changes: 77 additions & 16 deletions pkgs/applications/graphics/gthumb/default.nix
Original file line number Diff line number Diff line change
@@ -1,32 +1,93 @@
{ stdenv, fetchurl, gnome3, itstool, libxml2, pkgconfig, intltool,
exiv2, libjpeg, libtiff, gst_all_1, libraw, libsoup, libsecret,
glib, gtk3, gsettings-desktop-schemas,
libchamplain, librsvg, libwebp, json-glib, webkitgtk, lcms2, bison,
flex, wrapGAppsHook, shared-mime-info }:
{ stdenv
, fetchurl
, fetchpatch
, gnome3
, pkgconfig
, meson
, ninja
, exiv2
, libjpeg
, libtiff
, gst_all_1
, libraw
, libsoup
, libsecret
, glib
, gtk3
, gsettings-desktop-schemas
, libchamplain
, librsvg
, libwebp
, json-glib
, webkitgtk
, lcms2
, bison
, flex
, clutter-gtk
, wrapGAppsHook
, shared-mime-info
, python3
, desktop-file-utils
, itstool
}:

stdenv.mkDerivation rec {
pname = "gthumb";
version = "3.6.2";
version = "3.8.0";

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0rjb0bsjhn7nyl5jyjgrypvr6qdr9dc2g586j3lzan96a2vnpgy9";
sha256 = "1l2s1facq1r6yvqjqc34aqfzlvb3nhkhn79xisxbbdlgrrxdq52f";
};

nativeBuildInputs = [ itstool libxml2 intltool pkgconfig bison flex wrapGAppsHook ];
nativeBuildInputs = [
bison
desktop-file-utils
flex
itstool
meson
ninja
pkgconfig
python3
wrapGAppsHook
];

buildInputs = [
glib gtk3 gsettings-desktop-schemas gst_all_1.gstreamer gst_all_1.gst-plugins-base
exiv2 libjpeg libtiff libraw libsoup libsecret libchamplain
librsvg libwebp json-glib webkitgtk lcms2 gnome3.adwaita-icon-theme
clutter-gtk
exiv2
glib
gnome3.adwaita-icon-theme
gsettings-desktop-schemas
gst_all_1.gst-plugins-base
gst_all_1.gstreamer
gtk3
json-glib
lcms2
libchamplain
libjpeg
libraw
librsvg
libsecret
libsoup
libtiff
libwebp
webkitgtk
];

enableParallelBuilding = true;

configureFlags = [
"--enable-libchamplain"
mesonFlags = [
"-Dlibchamplain=true"
];

postPatch = ''
chmod +x gthumb/make-gthumb-h.py
patchShebangs data/gschemas/make-enums.py \
gthumb/make-gthumb-h.py \
po/make-potfiles-in.py \
postinstall.py \
gthumb/make-authors-tab.py
'';

preFixup = ''
gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share")
'';
@@ -41,7 +102,7 @@ stdenv.mkDerivation rec {
homepage = "https://wiki.gnome.org/Apps/Gthumb";
description = "Image browser and viewer for GNOME";
platforms = platforms.linux;
license = licenses.gpl2;
license = licenses.gpl2Plus;
maintainers = [ maintainers.mimadrid ];
};
}