diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2020-04-16 10:09:43 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2020-04-16 10:09:43 +0200 |
commit | 3d8e43691731037672c36129cbecb2fe43ffad7e (patch) | |
tree | c7f5fe5732dd22a66330d041ee7b0139f75b412d /pkgs/applications/graphics | |
parent | a04625379a9e842cb987197c4f273de1bea807b7 (diff) | |
parent | 342eaba9ebbc68923c1028a56be1c94e74862832 (diff) |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/inkscape/default.nix | 143 | ||||
-rw-r--r-- | pkgs/applications/graphics/kodelife/default.nix | 7 | ||||
-rw-r--r-- | pkgs/applications/graphics/luminance-hdr/default.nix | 5 | ||||
-rw-r--r-- | pkgs/applications/graphics/qimgv/default.nix | 44 |
4 files changed, 123 insertions, 76 deletions
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 763c9f4db220e..86fb6e0349152 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -1,54 +1,62 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, perlPackages, libXft -, libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2 -, glibmm, libsigcxx, lcms, boost, gettext, makeWrapper -, gsl, gtkspell2, cairo, python2, poppler, imagemagick, libwpg, librevenge -, libvisio, libcdr, libexif, potrace, cmake -, librsvg, wrapGAppsHook +{ stdenv +, boehmgc +, boost +, cairo +, cmake +, fetchpatch +, fetchurl +, gettext +, glib +, glibmm +, gsl +, gtkmm2 +, gtkspell2 +, imagemagick +, lcms +, libcdr +, libexif +, libpng +, librevenge +, librsvg +, libsigcxx +, libvisio +, libwpg +, libXft +, libxml2 +, libxslt +, makeWrapper +, perlPackages +, pkg-config +, poppler +, popt +, potrace +, python3 +, wrapGAppsHook +, zlib }: - let - python2Env = python2.withPackages(ps: with ps; - [ numpy lxml scour ]); + python3Env = python3.withPackages + (ps: with ps; [ + numpy + lxml + scour + ]); in - stdenv.mkDerivation rec { - name = "inkscape-0.92.4"; + pname = "inkscape"; + version = "0.92.5"; src = fetchurl { - url = "https://media.inkscape.org/dl/resources/file/${name}.tar.bz2"; - sha256 = "0pjinhjibfsz1aywdpgpj3k23xrsszpj4a1ya5562dkv2yl2vv2p"; + url = "https://media.inkscape.org/dl/resources/file/${pname}-${version}.tar.bz2"; + sha256 = "ge5/aeK9ZKlzQ9g5Wkp6eQWyG4YVZu1eXZF5F41Rmgs="; }; - patches = [ - (fetchpatch { - name = "inkscape-poppler_0_76_compat.patch"; - url = "https://gitlab.com/inkscape/inkscape/commit/e831b034746f8dc3c3c1b88372751f6dcb974831.diff"; - sha256 = "096rdyi6ppjq1h9jwwsm9hb99nggfrfinik8rm23jkn4h2zl01zf"; - }) - (fetchpatch { - name = "inkscape-poppler_0_82_compat.patch"; - url = "https://gitlab.com/inkscape/inkscape/commit/835b6bb62be565efab986d5a3f30a672ad56c7eb.patch"; - sha256 = "02c6sxi2w52b885vr3pgani6kvxp9gdqqk2jgiykkdzv70hhrnm7"; - }) - (fetchpatch { - name = "inkscape-poppler_0_83_compat.patch"; - url = "https://gitlab.com/inkscape/inkscape/commit/b5360a807b12d4e8318475ffd0464b84882788b5.patch"; - sha256 = "1p44rr2q2i3zkd1y1j7xgdcbgx8yvlq6hq92im8s0bkjby6p5cpz"; - }) - ]; - # Inkscape hits the ARGMAX when linking on macOS. It appears to be # CMake’s ARGMAX check doesn’t offer enough padding for NIX_LDFLAGS. # Setting strictDeps it avoids duplicating some dependencies so it # will leave us under ARGMAX. strictDeps = true; - unpackPhase = '' - cp $src ${name}.tar.bz2 - tar xvjf ${name}.tar.bz2 > /dev/null - cd ${name} - ''; - postPatch = '' patchShebangs share/extensions patchShebangs fix-roff-punct @@ -56,24 +64,52 @@ stdenv.mkDerivation rec { # Python is used at run-time to execute scripts, e.g., those from # the "Effects" menu. substituteInPlace src/extension/implementation/script.cpp \ - --replace '"python-interpreter", "python"' '"python-interpreter", "${python2Env}/bin/python"' + --replace '"python-interpreter", "python"' '"python-interpreter", "${python3Env}/bin/python"' ''; - nativeBuildInputs = [ pkgconfig cmake makeWrapper python2Env wrapGAppsHook ] - ++ (with perlPackages; [ perl XMLParser ]); - buildInputs = [ - libXft libpng zlib popt boehmgc - libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext - gsl poppler imagemagick libwpg librevenge - libvisio libcdr libexif potrace + nativeBuildInputs = [ + pkg-config + cmake + makeWrapper + python3Env + wrapGAppsHook + ] ++ (with perlPackages; [ + perl + XMLParser + ]); + buildInputs = [ + boehmgc + boost + gettext + glib + glibmm + gsl + gtkmm2 + imagemagick + lcms + libcdr + libexif + libpng + librevenge librsvg # for loading icons - - python2Env perlPackages.perl - ] ++ stdenv.lib.optional (!stdenv.isDarwin) gtkspell2 - ++ stdenv.lib.optional stdenv.isDarwin cairo; - - enableParallelBuilding = true; + libsigcxx + libvisio + libwpg + libXft + libxml2 + libxslt + perlPackages.perl + poppler + popt + potrace + python3Env + zlib + ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ + gtkspell2 + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + cairo + ]; # Make sure PyXML modules can be found at run-time. postInstall = stdenv.lib.optionalString stdenv.isDarwin '' @@ -82,9 +118,10 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - license = "GPL"; - homepage = "https://www.inkscape.org"; description = "Vector graphics editor"; + homepage = "https://www.inkscape.org"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.jtojnar ]; platforms = platforms.all; longDescription = '' Inkscape is a feature-rich vector graphics editor that edits diff --git a/pkgs/applications/graphics/kodelife/default.nix b/pkgs/applications/graphics/kodelife/default.nix index 6f935e72fb53d..e5aac9b8823d2 100644 --- a/pkgs/applications/graphics/kodelife/default.nix +++ b/pkgs/applications/graphics/kodelife/default.nix @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://hexler.net/pub/${pname}/${pname}-${version}-${suffix}.zip"; sha256 = { - aarch64-linux = "1lcpj1mgkvksq1d08ibh59y0dmdh7zm77wi5ziqhg3p5g9nxyasd"; - armv7l-linux = "0sljy06302x567jqw5lagbyhpc3j140jk4wccacxjrbb6hcx3l42"; - x86_64-darwin = "1b058s9kny026q395nj99v8hggxkgv43nnjkmx1a2siajw0db94c"; + aarch64-linux = "0z2fqlf156348ha3zhv16kvqdx68fbwbzch2gzjm9x1na9n5k1ra"; + armv7l-linux = "1ppwgrmgl1j2ws9mhrscvvkamd69a6xw7x35df6d30cyj97r0mzy"; + x86_64-darwin = "0f8vn6m3xzsiyxm2ka5wkbp63wvzrix6g1xrbpvcm3v2llmychkl"; x86_64-linux = "035c1nlw0nim057sz3axpkcgkafqbm6gpr8hwr097vlrqll6w3dv"; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { dontBuild = true; dontStrip = true; dontPatchELF = true; + preferLocalBuild = true; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/graphics/luminance-hdr/default.nix b/pkgs/applications/graphics/luminance-hdr/default.nix index 3359365cff1b1..811a907746d55 100644 --- a/pkgs/applications/graphics/luminance-hdr/default.nix +++ b/pkgs/applications/graphics/luminance-hdr/default.nix @@ -1,9 +1,10 @@ -{ stdenv, cmake, fetchFromGitHub, pkgconfig, boost, exiv2, fftwFloat, gsl +{ stdenv, mkDerivation, cmake, fetchFromGitHub, pkgconfig +, boost, exiv2, fftwFloat, gsl , ilmbase, lcms2, libraw, libtiff, openexr , qtbase, qtdeclarative, qttools, qtwebengine, eigen }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "luminance-hdr"; version = "2.6.0"; diff --git a/pkgs/applications/graphics/qimgv/default.nix b/pkgs/applications/graphics/qimgv/default.nix index 6402868b9221e..2756d659edf39 100644 --- a/pkgs/applications/graphics/qimgv/default.nix +++ b/pkgs/applications/graphics/qimgv/default.nix @@ -1,6 +1,15 @@ -{ mkDerivation, fetchFromGitHub, lib -, pkgconfig, cmake -, exiv2, qtbase, qtimageformats, qtsvg +{ mkDerivation +, lib +, fetchFromGitHub + +, cmake +, pkgconfig + +, exiv2 +, mpv +, qtbase +, qtimageformats +, qtsvg }: mkDerivation rec { @@ -14,33 +23,32 @@ mkDerivation rec { sha256 = "0cmya06j466v0pirhxbzbj1vbz0346y7rbc1gbv4n9xcp6c6bln6"; }; - cmakeFlags = [ - # Video support appears to be broken; the following gets printed upon - # attempting to view an mp4, webm, or mkv (and probably all video formats): - # - # [VideoPlayerInitProxy] Error - could not load player library - # "qimgv_player_mpv" - # - # GIFs are unaffected. If this ever gets addressed, all that is necessary is - # to add `mpv` to the arguments list and to `buildInputs`, and to remove - # `cmakeFlags`. - "-DVIDEO_SUPPORT=OFF" - ]; - nativeBuildInputs = [ - pkgconfig cmake + pkgconfig ]; buildInputs = [ exiv2 + mpv qtbase qtimageformats qtsvg ]; + postPatch = '' + sed -i "s@/usr/bin/mpv@${mpv}/bin/mpv@" \ + qimgv/settings.cpp + ''; + + # Wrap the library path so it can see `libqimgv_player_mpv.so`, which is used + # to play video files within qimgv itself. + qtWrapperArgs = [ + "--prefix LD_LIBRARY_PATH : ${placeholder "out"}/lib" + ]; + meta = with lib; { - description = "Qt5 image viewer with optional video support"; + description = "A Qt5 image viewer with optional video support"; homepage = "https://github.com/easymodo/qimgv"; license = licenses.gpl3; platforms = platforms.linux; |