diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-27 15:09:19 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-27 15:09:19 +0100 |
commit | b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf (patch) | |
tree | 220c385a8657d85bb6b305819a1842a3b1f4079c /pkgs/applications/graphics/photoflow/default.nix | |
parent | 977848375167f4671a03ccc0dbf5896f4cf0d3fe (diff) | |
parent | be36f6f0a0ffbeef228a021f5a343f5ce7a183de (diff) | |
download | nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.gz nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.bz2 nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.lz nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.xz nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.zst nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/graphics/photoflow/default.nix')
-rw-r--r-- | pkgs/applications/graphics/photoflow/default.nix | 70 |
1 files changed, 52 insertions, 18 deletions
diff --git a/pkgs/applications/graphics/photoflow/default.nix b/pkgs/applications/graphics/photoflow/default.nix index 9fec8b99c1b..cb8ef65b2e9 100644 --- a/pkgs/applications/graphics/photoflow/default.nix +++ b/pkgs/applications/graphics/photoflow/default.nix @@ -1,42 +1,75 @@ -{ stdenv, fetchFromGitHub, gettext, glib, libxml2, pkgconfig, swig, automake, gobject-introspection, cmake, ninja, libtiff, libjpeg, fftw, exiv2, lensfun, gtkmm2, libraw, lcms2, libexif, vips, expat, pcre, pugixml }: +{ automake +, cmake +, exiv2 +, expat +, fetchFromGitHub +, fftw +, fftwFloat +, gettext +, glib +, gobject-introspection +, gtkmm2 +, lcms2 +, lensfun +, libexif +, libiptcdata +, libjpeg +, libraw +, libtiff +, libxml2 +, ninja +, openexr +, pcre +, pkgconfig +, pugixml +, stdenv +, swig +, vips +}: -stdenv.mkDerivation { - name = "photoflow-unstable-2018-08-28"; +stdenv.mkDerivation rec { + pname = "photoflow"; + version = "2020-08-28"; src = fetchFromGitHub { owner = "aferrero2707"; - repo = "PhotoFlow"; - rev = "df03f2538ddd232e693c307db4ab63eb5bdfea38"; - sha256 = "08ybhv08h24y4li8wb4m89xgrz1szlwpksf6vjharp8cznn4y4x9"; + repo = pname; + rev = "8472024fb91175791e0eb23c434c5b58ecd250eb"; + sha256 = "1bq4733hbh15nwpixpyhqfn3bwkg38amdj2xc0my0pii8l9ln793"; }; + patches = [ ./CMakeLists.patch ]; + nativeBuildInputs = [ + automake + cmake gettext glib + gobject-introspection libxml2 + ninja pkgconfig swig - automake - gobject-introspection - cmake - ninja ]; buildInputs = [ - libtiff - libjpeg - fftw exiv2 - lensfun + expat + fftw + fftwFloat gtkmm2 # Could be build with gtk3 but proper UI theme is missing and therefore not very usable with gtk3 # See: https://discuss.pixls.us/t/help-needed-for-gtk3-theme/5803 - libraw lcms2 + lensfun libexif - vips - expat + libiptcdata + libjpeg + libraw + libtiff + openexr pcre pugixml + vips ]; cmakeFlags = [ @@ -51,6 +84,7 @@ stdenv.mkDerivation { license = licenses.gpl3Plus; maintainers = [ maintainers.MtP ]; platforms = platforms.linux; - broken = true; + # sse3 is not supported on aarch64 + badPlatforms = [ "aarch64-linux" ]; }; } |