diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-04-11 18:23:14 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-11 18:23:14 +0200 |
commit | 993e2b4ec2e670b3bb02b0ad19c83f0ae365c198 (patch) | |
tree | 65f87a2bdebf8650d2b8aa42c5784e510b52abe8 /pkgs/applications/graphics | |
parent | b54bce24cf4da02d7ddd91a745573a1e096f89b2 (diff) | |
parent | d85c466936e505a0925ad8e6dc3c4117e3dc9f29 (diff) | |
download | nixlib-993e2b4ec2e670b3bb02b0ad19c83f0ae365c198.tar nixlib-993e2b4ec2e670b3bb02b0ad19c83f0ae365c198.tar.gz nixlib-993e2b4ec2e670b3bb02b0ad19c83f0ae365c198.tar.bz2 nixlib-993e2b4ec2e670b3bb02b0ad19c83f0ae365c198.tar.lz nixlib-993e2b4ec2e670b3bb02b0ad19c83f0ae365c198.tar.xz nixlib-993e2b4ec2e670b3bb02b0ad19c83f0ae365c198.tar.zst nixlib-993e2b4ec2e670b3bb02b0ad19c83f0ae365c198.zip |
Merge pull request #59098 from NixOS/staging-next
Staging next
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/seg3d/default.nix | 1 | ||||
-rw-r--r-- | pkgs/applications/graphics/shotwell/default.nix | 90 |
2 files changed, 74 insertions, 17 deletions
diff --git a/pkgs/applications/graphics/seg3d/default.nix b/pkgs/applications/graphics/seg3d/default.nix index bca88cc70130..58cec2ec1703 100644 --- a/pkgs/applications/graphics/seg3d/default.nix +++ b/pkgs/applications/graphics/seg3d/default.nix @@ -23,7 +23,6 @@ stdenv.mkDerivation { "-DBUILD_BIOMESH3D=1" "-DWITH_TETGEN=1" "-DBUILD_TYPE=Release" - "-DBUILD_TESTING=0" "-DWITH_WXWIDGETS=ON" "-DITK_DIR=${itk}/lib/InsightToolkit" "-DGDCM_LIBRARY=${itk}/lib/libitkgdcm.a" diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 354e9725a43e..f31b6d323995 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -1,31 +1,89 @@ -{ fetchurl, stdenv, meson, ninja, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite -, webkitgtk, pkgconfig, gnome3, gst_all_1, libgudev, libraw, glib, json-glib, gcr -, gettext, desktop-file-utils, gdk_pixbuf, librsvg, wrapGAppsHook -, gobject-introspection, itstool, libgdata, python3 }: +{ stdenv +, fetchurl +, fetchpatch +, meson +, ninja +, gtk3 +, libexif +, libgphoto2 +, libwebp +, libsoup +, libxml2 +, vala +, sqlite +, webkitgtk +, pkgconfig +, gnome3 +, gst_all_1 +, libgudev +, libraw +, glib +, json-glib +, gcr +, libgee +, gexiv2 +, librest +, gettext +, desktop-file-utils +, gdk_pixbuf +, librsvg +, wrapGAppsHook +, gobject-introspection +, itstool +, libgdata +, libchamplain +, python3 +}: # for dependencies see https://wiki.gnome.org/Apps/Shotwell/BuildingAndInstalling -let +stdenv.mkDerivation rec { pname = "shotwell"; - version = "0.30.2"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "0.31.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0pam0si110vkc65kh59lrmgkv91f9zxmf1gpfm99ixjgw25rfi8r"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1pwq953wl7h9cvw7rvlr6pcbq9w28kkr7ddb8x2si81ngp0imwyx"; }; nativeBuildInputs = [ - meson ninja vala pkgconfig itstool gettext desktop-file-utils python3 wrapGAppsHook gobject-introspection + meson + ninja + vala + pkgconfig + itstool + gettext + desktop-file-utils + python3 + wrapGAppsHook + gobject-introspection ]; buildInputs = [ - gtk3 libexif libgphoto2 libsoup libxml2 sqlite webkitgtk - gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee - libgudev gnome3.gexiv2 gnome3.gsettings-desktop-schemas - libraw json-glib glib gdk_pixbuf librsvg gnome3.rest - gcr gnome3.adwaita-icon-theme libgdata + gtk3 + libexif + libgphoto2 + libwebp + libsoup + libxml2 + sqlite + webkitgtk + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + libgee + libgudev + gexiv2 + gnome3.gsettings-desktop-schemas + libraw + json-glib + glib + gdk_pixbuf + librsvg + librest + gcr + gnome3.adwaita-icon-theme + libgdata + libchamplain ]; postPatch = '' |