diff options
Diffstat (limited to 'pkgs/applications/graphics')
33 files changed, 100 insertions, 149 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index d8c11f33439a..86aafa9697df 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, libtool +{ lib, stdenv, fetchFromGitHub, pkgconfig, libtool , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif , ApplicationServices -, buildPlatform, hostPlatform +, hostPlatform }: let @@ -14,8 +14,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.8-2"; - sha256 = "06cpvvv8xikw5jm1pa2xxxlnsy743ham67yshpndn2x3fyf48267"; + version = "7.0.8-6"; + sha256 = "1v7m1g9a7fqc8nravvv3dy54nzd3ip75hcnkdrpb5wbiz9pqgzi3"; patches = []; }; in diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index b767f11da00b..94a4aeaa9337 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -2,7 +2,7 @@ , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, fftw, libheif, libde265 , ApplicationServices -, buildPlatform, hostPlatform +, hostPlatform }: let diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix index 5fb7e0078065..532645803808 100644 --- a/pkgs/applications/graphics/ahoviewer/default.nix +++ b/pkgs/applications/graphics/ahoviewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, fetchurl, fetchFromGitHub, pkgconfig, libconfig, +{ stdenv, fetchFromGitHub, pkgconfig, libconfig, gtkmm2, glibmm, libxml2, libsecret, curl, libzip, librsvg, gst_all_1, autoreconfHook, makeWrapper, useUnrar ? false, unrar diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index fbf6443b91f8..521f957ec1e9 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -1,15 +1,15 @@ -{ stdenv, lib, makeDesktopItem, fetchurl, unzip +{ stdenv, makeDesktopItem, fetchurl, unzip , gdk_pixbuf, glib, gtk2, atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome2 , xorg, mozjpeg }: stdenv.mkDerivation rec { name = "avocode-${version}"; - version = "3.1.1"; + version = "3.2.0"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "1qvyc08i3b4rr43ssz78xndm4bx8lz2vigh6w9gd7w367xjf4f5b"; + sha256 = "111kcjqm8j2v941m2ly4ahhxalylnsvy5zmclj1f490japz2h1xy"; }; libPath = stdenv.lib.makeLibraryPath (with xorg; with gnome2; [ diff --git a/pkgs/applications/graphics/awesomebump/default.nix b/pkgs/applications/graphics/awesomebump/default.nix index f7a813f36061..df742645e86b 100644 --- a/pkgs/applications/graphics/awesomebump/default.nix +++ b/pkgs/applications/graphics/awesomebump/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, qtbase, qmake, makeWrapper, qtscript, gcc, flex, bison, qtdeclarative, gnutar }: +{ lib, stdenv, fetchgit, qtbase, qmake, makeWrapper, qtscript, flex, bison, qtdeclarative }: let diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 5c6a4bab9306..a31bbe8caeb6 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, doxygen, extra-cmake-modules, wrapGAppsHook, fetchpatch +{ mkDerivation, lib, fetchFromGitHub, cmake, doxygen, extra-cmake-modules, wrapGAppsHook # For `digitaglinktree` , perl, sqlite @@ -35,7 +35,6 @@ , libusb1 , marble , libGLU_combined -, mysql , opencv3 , pcre , threadweaver diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/applications/graphics/dosage/default.nix index 7667b674fcec..69d09cd429c1 100644 --- a/pkgs/applications/graphics/dosage/default.nix +++ b/pkgs/applications/graphics/dosage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pythonPackages, fetchFromGitHub }: +{ pythonPackages, fetchFromGitHub }: pythonPackages.buildPythonApplication rec { pname = "dosage"; diff --git a/pkgs/applications/graphics/draftsight/default.nix b/pkgs/applications/graphics/draftsight/default.nix index d817424c4525..30101bb94770 100644 --- a/pkgs/applications/graphics/draftsight/default.nix +++ b/pkgs/applications/graphics/draftsight/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, dpkg, makeWrapper, gcc, libGLU_combined, xdg_utils, - dbus_tools, alsaLib, cups, fontconfig, glib, icu, libpng12, + dbus, alsaLib, cups, fontconfig, glib, icu, libpng12, xkeyboard_config, zlib, libxslt, libxml2, sqlite, orc, libX11, libXcursor, libXrandr, libxcb, libXi, libSM, libICE, libXrender, libXcomposite }: @@ -71,7 +71,7 @@ stdenv.mkDerivation { }; libPath = stdenv.lib.makeLibraryPath [ gcc.cc libGLU_combined xdg_utils - dbus_tools alsaLib cups.lib fontconfig glib icu libpng12 + dbus alsaLib cups.lib fontconfig glib icu libpng12 xkeyboard_config zlib libxslt libxml2 sqlite orc libX11 libXcursor libXrandr libxcb libXi libSM libICE libXrender libXcomposite ]; diff --git a/pkgs/applications/graphics/epeg/default.nix b/pkgs/applications/graphics/epeg/default.nix index 02528a43e31b..ef694dec6527 100644 --- a/pkgs/applications/graphics/epeg/default.nix +++ b/pkgs/applications/graphics/epeg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, libtool, autoconf, automake +{ stdenv, fetchFromGitHub, pkgconfig, libtool, autoconf, automake , libjpeg, libexif }: diff --git a/pkgs/applications/graphics/exrdisplay/default.nix b/pkgs/applications/graphics/exrdisplay/default.nix index e698fb8f2341..562fb8c11dc3 100644 --- a/pkgs/applications/graphics/exrdisplay/default.nix +++ b/pkgs/applications/graphics/exrdisplay/default.nix @@ -1,6 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, fltk, openexr, libGLU_combined, openexr_ctl }: - -assert fltk.glSupport; +{ stdenv, fetchurl, pkgconfig, fltk, openexr, libGLU_combined, ctl }: stdenv.mkDerivation { name ="openexr_viewers-2.2.1"; @@ -14,14 +12,14 @@ stdenv.mkDerivation { ./configure --prefix=$out --with-fltk-config=${fltk}/bin/fltk-config ''; - buildPahse = '' + buildPhase = '' make LDFLAGS="`fltk-config --ldflags` -lGL -lfltk_gl" ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openexr fltk libGLU_combined openexr_ctl ]; + buildInputs = [ openexr fltk libGLU_combined ctl ]; - meta = { + meta = { description = "Application for viewing OpenEXR images on a display at various exposure settings"; homepage = http://openexr.com; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 8001080a170a..6362d6c06fe9 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts -, hdf5, vtk, medfile, boost, zlib, python27Packages, swig, gfortran, fetchpatch +, hdf5, vtk, medfile, zlib, python27Packages, swig, gfortran, fetchpatch , soqt, libf2c, makeWrapper, makeDesktopItem , mpi ? null }: @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { sha256 = "1yv6abdzlpn4wxy315943xwrnbywxqfgkjib37qwfvbb8y9p60df"; }; - buildInputs = with pythonPackages; [ cmake coin3d xercesc ode eigen qt4 opencascade gts + buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts zlib swig gfortran soqt libf2c makeWrapper mpi vtk hdf5 medfile ] ++ (with pythonPackages; [ matplotlib pycollada pyside pysideShiboken pysideTools pivy python boost diff --git a/pkgs/applications/graphics/fstl/default.nix b/pkgs/applications/graphics/fstl/default.nix index 355acf7681a0..b1437508a509 100644 --- a/pkgs/applications/graphics/fstl/default.nix +++ b/pkgs/applications/graphics/fstl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, qtbase, mesa_glu, qmake}: +{stdenv, fetchFromGitHub, qtbase, mesa_glu}: stdenv.mkDerivation rec { name = "fstl-${version}"; version = "0.9.3"; diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix index 2d4fa882dd61..b4715902df1f 100644 --- a/pkgs/applications/graphics/glabels/default.nix +++ b/pkgs/applications/graphics/glabels/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, barcode, gnome3, autoreconfHook , gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book -, intltool, itstool, makeWrapper, pkgconfig, which +, intltool, itstool, makeWrapper, pkgconfig }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix index 3d49452cbe62..99230eb23e32 100644 --- a/pkgs/applications/graphics/goxel/default.nix +++ b/pkgs/applications/graphics/goxel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, scons, pkgconfig, wrapGAppsHook +{ stdenv, fetchFromGitHub, scons, pkgconfig, wrapGAppsHook , glfw3, gtk3, libpng12 }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index 2c322128c386..ee58e9831e9a 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, bzip2, freetype, graphviz, ghostscript +{ stdenv, fetchurl, bzip2, freetype, graphviz, ghostscript , libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz, libX11 , libwebp, quantumdepth ? 8, fixDarwinDylibNames }: diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 639f1928f8a4..a82f13ee409a 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, perl, perlXMLParser, libXft +{ stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libXft , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2 , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper , gsl, python2, poppler, imagemagick, libwpg, librevenge diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix index 996d495d87c1..3555c2b477ff 100644 --- a/pkgs/applications/graphics/k3d/default.nix +++ b/pkgs/applications/graphics/k3d/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, unzip, ftgl, glew, asciidoc +{ stdenv, fetchFromGitHub, fetchpatch, ftgl, glew, asciidoc , cmake, ninja, libGLU_combined, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype , libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff , gettext, intltool, perl, gtkmm2, glibmm, gtkglext, pangox_compat, libXmu }: diff --git a/pkgs/applications/graphics/kgraphviewer/default.nix b/pkgs/applications/graphics/kgraphviewer/default.nix index 8f043816ba06..0d898df14b3f 100644 --- a/pkgs/applications/graphics/kgraphviewer/default.nix +++ b/pkgs/applications/graphics/kgraphviewer/default.nix @@ -1,5 +1,5 @@ { stdenv, mkDerivation, fetchurl, cmake, extra-cmake-modules, pkgconfig, wrapGAppsHook -, kconfig, kcrash, kinit, kdoctools, kiconthemes, kio, kparts, kwidgetsaddons +, kconfig, kinit, kdoctools, kio, kparts, kwidgetsaddons , qtbase, qtsvg , boost, graphviz }: diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 1fd19162a4f7..836a78ce058b 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, fetchpatch, cmake, extra-cmake-modules +{ mkDerivation, lib, fetchurl, cmake, extra-cmake-modules , karchive, kconfig, kwidgetsaddons, kcompletion, kcoreaddons , kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem , kio, kcrash @@ -10,11 +10,11 @@ mkDerivation rec { name = "krita-${version}"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { url = "https://download.kde.org/stable/krita/${version}/${name}.tar.gz"; - sha256 = "1mbyybc7h3sblbaklvz0cci3ys4zcyi616fgdn06p62v2vw2sybq"; + sha256 = "1qz9bjvnwa5gc2b0063i2p72jq6y1b6kgqdj39599acp7ws11asw"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/pkgs/applications/graphics/ktikz/default.nix b/pkgs/applications/graphics/ktikz/default.nix index 8817071e9843..4b3a423a8ce2 100644 --- a/pkgs/applications/graphics/ktikz/default.nix +++ b/pkgs/applications/graphics/ktikz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gettext, poppler_qt5, qt5 , pkgconfig }: +{ stdenv, fetchFromGitHub, gettext, poppler, qt5 , pkgconfig }: # Warning: You will also need a working pdflatex installation containing # at least auctex and pgf. @@ -64,8 +64,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gettext qt5.full poppler_qt5 ]; + buildInputs = [ gettext qt5.full poppler ]; enableParallelBuilding = true; } - diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix index 1103c9ff40a9..05d047f72275 100644 --- a/pkgs/applications/graphics/nomacs/default.nix +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -1,7 +1,6 @@ { stdenv , fetchFromGitHub , cmake -, makeWrapper , pkgconfig , wrapGAppsHook , gsettings-desktop-schemas @@ -18,12 +17,12 @@ }: stdenv.mkDerivation rec { - version = "3.10.0"; + version = "3.10.2"; src = fetchFromGitHub { owner = "nomacs"; repo = "nomacs"; rev = version; - sha256 = "07k921r4m6p5kicyb55zdfp58m8mlc94g2csq354d7v20m71zwrv"; + sha256 = "0v2gsdc8caswf2b5aa023d8kil1fqf4r9mlg15180h3c92f8jzvh"; }; name = "nomacs-${version}"; diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 9ab5288700cc..44855d5c8b49 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, qt5, libsForQt5 +{ stdenv, fetchFromGitHub, qt5, libsForQt5 , bison, flex, eigen, boost, libGLU_combined, glew, opencsg, cgal , mpfr, gmp, glib, pkgconfig, harfbuzz, gettext }: diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index e5385c752804..1d9956245a63 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -6,7 +6,7 @@ stdenv, fetchFromGitHub, cmake, makeWrapper stdenv.mkDerivation rec { name = "paraview-${version}"; - version = "5.4.1"; + version = "5.5.2"; # fetching from GitHub instead of taking an "official" source # tarball because of missing submodules there @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "Kitware"; repo = "ParaView"; rev = "v${version}"; - sha256 = "1ma02sdkz2apxnwcsyvxb26ibwnjh60p71gicw6nlp042acs6v74"; + sha256 = "1jivph7lppnflmjsiirhgv0mnh8mxx41i1vzkk78ynn00rzacx3j"; fetchSubmodules = true; }; @@ -22,13 +22,14 @@ stdenv.mkDerivation rec { "-DPARAVIEW_ENABLE_PYTHON=ON" "-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON" "-DPARAVIEW_ENABLE_EMBEDDED_DOCUMENTATION=OFF" + "-DOpenGL_GL_PREFERENCE=GLVND" ]; # During build, binaries are called that rely on freshly built # libraries. These reside in build/lib, and are not found by # default. preBuild = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib:$PWD/VTK/ThirdParty/vtkm/vtk-m/lib ''; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/processing3/default.nix b/pkgs/applications/graphics/processing3/default.nix index 4ef078fdbac6..6916ef4ad7aa 100644 --- a/pkgs/applications/graphics/processing3/default.nix +++ b/pkgs/applications/graphics/processing3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchFromGitHub, makeWrapper, ant, jdk, rsync, javaPackages, libXxf86vm }: +{ stdenv, fetchFromGitHub, fetchurl, xmlstarlet, makeWrapper, ant, jdk, rsync, javaPackages, libXxf86vm, gsettings-desktop-schemas }: stdenv.mkDerivation rec { version = "3.3.7"; @@ -19,6 +19,14 @@ stdenv.mkDerivation rec { rm core/library/*.jar cp ${javaPackages.jogl_2_3_2}/share/java/*.jar core/library/ + # do not download a file during build + ${xmlstarlet}/bin/xmlstarlet ed --inplace -P -d '//get[@src="http://download.processing.org/reference.zip"]' build/build.xml + install -D -m0444 ${fetchurl { + url = http://download.processing.org/reference.zip; + sha256 = "104zig026y8vbl4qksmscjq0bms8mi2jmri1ijdlbkxcqnv9bnlf"; + } + } ./java/reference.zip + # suppress "Not fond of this Java VM" message box substituteInPlace app/src/processing/app/platform/LinuxPlatform.java \ --replace 'Messages.showWarning' 'if (false) Messages.showWarning' @@ -37,9 +45,11 @@ stdenv.mkDerivation rec { ln -s ${jdk} $out/${name}/java makeWrapper $out/${name}/processing $out/bin/processing \ + --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name} \ --prefix _JAVA_OPTIONS " " -Dawt.useSystemAAFontSettings=lcd \ --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib makeWrapper $out/${name}/processing-java $out/bin/processing-java \ + --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name} \ --prefix _JAVA_OPTIONS " " -Dawt.useSystemAAFontSettings=lcd \ --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib ''; diff --git a/pkgs/applications/graphics/renderdoc/custom_swig.patch b/pkgs/applications/graphics/renderdoc/custom_swig.patch deleted file mode 100644 index e6ed05ea97a5..000000000000 --- a/pkgs/applications/graphics/renderdoc/custom_swig.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/qrenderdoc/CMakeLists.txt b/qrenderdoc/CMakeLists.txt -index 2df9ffa5..66bafaba 100644 ---- a/qrenderdoc/CMakeLists.txt -+++ b/qrenderdoc/CMakeLists.txt -@@ -65,16 +65,6 @@ include(ExternalProject) - # Need bison for swig - find_package(BISON) - --# Compile our custom SWIG that will do scoped/strong enum classes --ExternalProject_Add(custom_swig -- # using an URL to a zip directly so we don't clone the history etc -- URL ${RENDERDOC_SWIG_PACKAGE} -- BUILD_IN_SOURCE 1 -- CONFIGURE_COMMAND ./autogen.sh > /dev/null 2>&1 -- COMMAND CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} ./configure --with-pcre=yes --prefix=${CMAKE_BINARY_DIR} > /dev/null -- BUILD_COMMAND $(MAKE) > /dev/null 2>&1 -- INSTALL_COMMAND $(MAKE) install > /dev/null 2>&1) -- - # Lastly find PySide 2, optionally, for Qt5 Python bindings - list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}") - -@@ -186,9 +176,8 @@ foreach(in ${swig_interfaces}) - get_filename_component(swig_file ${in} NAME_WE) - - add_custom_command(OUTPUT ${swig_file}_python.cxx ${swig_file}.py -- COMMAND ${CMAKE_BINARY_DIR}/bin/swig -v -Wextra -Werror -O -c++ -python -modern -modernargs -enumclass -fastunpack -py3 -builtin -I${CMAKE_CURRENT_SOURCE_DIR} -I${CMAKE_SOURCE_DIR}/renderdoc/api/replay -outdir ${CMAKE_CURRENT_BINARY_DIR} -o ${CMAKE_CURRENT_BINARY_DIR}/${swig_file}_python.cxx ${CMAKE_CURRENT_SOURCE_DIR}/${in} -+ COMMAND $ENV{NIXOS_CUSTOM_SWIG} -v -Wextra -Werror -O -c++ -python -modern -modernargs -enumclass -fastunpack -py3 -builtin -I${CMAKE_CURRENT_SOURCE_DIR} -I${CMAKE_SOURCE_DIR}/renderdoc/api/replay -outdir ${CMAKE_CURRENT_BINARY_DIR} -o ${CMAKE_CURRENT_BINARY_DIR}/${swig_file}_python.cxx ${CMAKE_CURRENT_SOURCE_DIR}/${in} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${in} -- DEPENDS custom_swig - DEPENDS ${RDOC_REPLAY_FILES} - DEPENDS ${QRD_INTERFACE_FILES}) - diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix index 2bd3ab89161f..9a21d457a83f 100644 --- a/pkgs/applications/graphics/renderdoc/default.nix +++ b/pkgs/applications/graphics/renderdoc/default.nix @@ -1,74 +1,62 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig -, qtbase, qtx11extras, qtsvg, makeWrapper, python3, bison -, pcre, vulkan-loader, xorg, autoreconfHook +, qtbase, qtx11extras, qtsvg, makeWrapper +, vulkan-loader, xorg +, python36, bison, pcre, automake, autoconf }: - let - custom_swig = stdenv.mkDerivation { - name = "renderdoc-custom-swig"; - src = fetchFromGitHub { - owner = "baldurk"; - repo = "swig"; - rev = "renderdoc-modified-1"; - sha256 = "1whymd3vamwnp4jqfc9asls3dw9wsdi21xhm1d2a4vx9nql8if1x"; - }; - - nativeBuildInputs = [ autoreconfHook pcre ]; - - autoreconfPhase = '' - patchShebangs autogen.sh - ./autogen.sh - ''; + custom_swig = fetchFromGitHub { + owner = "baldurk"; + repo = "swig"; + rev = "renderdoc-modified-5"; + sha256 = "0ihrxbx56p5wn589fbbsns93fp91sypqdzfxdy7l7v9sf69a41mw"; }; in stdenv.mkDerivation rec { + version = "1.0"; name = "renderdoc-${version}"; - version = "0.91"; src = fetchFromGitHub { owner = "baldurk"; repo = "renderdoc"; - rev = "2d8b2cf818746b6a2add54e2fef449398816a40c"; - sha256 = "07yc3fk7j2nqmrhc4dm3v2pgbc37scd7d28nlzk6v0hw99zck8k0"; + rev = "v${version}"; + sha256 = "0l7pjxfrly4llryjnwk42dzx65n78wc98h56qm4yh04ja8fdbx2y"; }; buildInputs = [ - qtbase qtsvg xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader + qtbase qtsvg xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader python36 ]; - nativeBuildInputs = [ cmake makeWrapper pkgconfig python3 bison ]; + nativeBuildInputs = [ cmake makeWrapper pkgconfig bison pcre automake autoconf ]; + + postUnpack = '' + cp -r ${custom_swig} swig + chmod -R +w swig + patchShebangs swig/autogen.sh + ''; cmakeFlags = [ "-DBUILD_VERSION_HASH=${src.rev}" "-DBUILD_VERSION_DIST_NAME=NixOS" - "-DBUILD_VERSION_DIST_VER=0.91" + "-DBUILD_VERSION_DIST_VER=${version}" "-DBUILD_VERSION_DIST_CONTACT=https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/graphics/renderdoc" - "-DBUILD_VERSION_DIST_STABLE=ON" - # TODO: use this instead of preConfigure once placeholders land - #"-DVULKAN_LAYER_FOLDER=${placeholder out}/share/vulkan/implicit_layer.d/" + "-DBUILD_VERSION_STABLE=ON" + # TODO: add once pyside2 is in nixpkgs + #"-DPYSIDE2_PACKAGE_DIR=${python36Packages.pyside2}" ]; + # Future work: define these in the above array via placeholders preConfigure = '' cmakeFlags+=" -DVULKAN_LAYER_FOLDER=$out/share/vulkan/implicit_layer.d/" + cmakeFlags+=" -DRENDERDOC_SWIG_PACKAGE=$PWD/../swig" ''; preFixup = '' - mkdir $out/bin/.bin - mv $out/bin/qrenderdoc $out/bin/.bin/qrenderdoc - ln -s $out/bin/.bin/qrenderdoc $out/bin/qrenderdoc wrapProgram $out/bin/qrenderdoc --suffix LD_LIBRARY_PATH : $out/lib --suffix LD_LIBRARY_PATH : ${vulkan-loader}/lib - mv $out/bin/renderdoccmd $out/bin/.bin/renderdoccmd - ln -s $out/bin/.bin/renderdoccmd $out/bin/renderdoccmd wrapProgram $out/bin/renderdoccmd --suffix LD_LIBRARY_PATH : $out/lib --suffix LD_LIBRARY_PATH : ${vulkan-loader}/lib ''; - # Set path to custom swig binary - NIXOS_CUSTOM_SWIG = "${custom_swig}/bin/swig"; - enableParallelBuilding = true; - patches = [ ./custom_swig.patch ]; - meta = with stdenv.lib; { description = "A single-frame graphics debugger"; homepage = https://renderdoc.org/; diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix index 2ca1fead84c8..0f47c82f0325 100644 --- a/pkgs/applications/graphics/sane/backends/generic.nix +++ b/pkgs/applications/graphics/sane/backends/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ stdenv , avahi, libjpeg, libusb1, libv4l, net_snmp, libpng , gettext, pkgconfig diff --git a/pkgs/applications/graphics/scantailor/advanced.nix b/pkgs/applications/graphics/scantailor/advanced.nix index 82a498968728..d55441e39fa5 100644 --- a/pkgs/applications/graphics/scantailor/advanced.nix +++ b/pkgs/applications/graphics/scantailor/advanced.nix @@ -1,49 +1,26 @@ -{ stdenv, fetchFromGitHub, makeDesktopItem +{ stdenv, fetchFromGitHub , cmake, libjpeg, libpng, libtiff, boost , qtbase, qttools }: stdenv.mkDerivation rec { name = "scantailor-advanced-${version}"; - version = "1.0.15"; + version = "1.0.16"; src = fetchFromGitHub { owner = "4lex4"; repo = "scantailor-advanced"; rev = "v${version}"; - sha256 = "031jqk64ig6lmscl5yg5lp116zwn0jl7xs9rlniqf6a8g4wfbjk9"; + sha256 = "0lc9lzbpiy5hgimyhl4s4q67pb9gacpy985gl6iy8pl79zxhmcyp"; }; nativeBuildInputs = [ cmake qttools ]; buildInputs = [ libjpeg libpng libtiff boost qtbase ]; - postInstall = '' - mkdir -p $out/share/icons/hicolor/scalable/apps - cp $src/resources/appicon.svg $out/share/icons/hicolor/scalable/apps/scantailor.svg - - mkdir -p $out/share/applications - cp $desktopItem/share/applications/* $out/share/applications/ - for entry in $out/share/applications/*.desktop; do - substituteAllInPlace $entry - done - ''; - - desktopItem = makeDesktopItem { - name = "scantailor-advanced"; - exec = "scantailor %f"; - icon = "scantailor"; - comment = meta.description; - desktopName = "Scan Tailor Advanced"; - genericName = "Scan Processing Software"; - mimeType = "image/png;image/tif;image/jpeg;"; - categories = "Graphics;"; - startupNotify = "true"; - }; - meta = with stdenv.lib; { homepage = https://github.com/4lex4/scantailor-advanced; description = "Interactive post-processing tool for scanned pages"; license = licenses.gpl3Plus; maintainers = with maintainers; [ jfrankenau ]; - platforms = platforms.gnu ++ platforms.linux; + platforms = with platforms; gnu ++ linux ++ darwin; }; } diff --git a/pkgs/applications/graphics/screencloud/default.nix b/pkgs/applications/graphics/screencloud/default.nix index cffe485711f6..292ae9c8faa8 100644 --- a/pkgs/applications/graphics/screencloud/default.nix +++ b/pkgs/applications/graphics/screencloud/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, cmake, qt4, quazip, qt-mobility, qxt, pythonPackages, glib }: +{ stdenv, fetchFromGitHub, cmake, qt4, quazip, qt-mobility, qxt, pythonPackages }: with stdenv.lib; stdenv.mkDerivation rec { diff --git a/pkgs/applications/graphics/shutter/default.nix b/pkgs/applications/graphics/shutter/default.nix index 3bc814e1e758..1f41253b6994 100644 --- a/pkgs/applications/graphics/shutter/default.nix +++ b/pkgs/applications/graphics/shutter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, perl, perlPackages, makeWrapper, imagemagick, gdk_pixbuf, librsvg +{ stdenv, fetchurl, perl, perlPackages, makeWrapper, imagemagick, gdk_pixbuf, librsvg , hicolor-icon-theme }: diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index 930a7e686f8f..63d35cc54531 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, boost, cairo, fontsConf, gettext, glibmm, gtk3, gtkmm3 -, libjack2, libsigcxx, libtool, libxmlxx, makeWrapper, mlt-qt5, pango, pkgconfig +{ stdenv, fetchFromGitHub, boost, cairo, gettext, glibmm, gtk3, gtkmm3 +, libjack2, libsigcxx, libxmlxx, makeWrapper, mlt-qt5, pango, pkgconfig , imagemagick, intltool, autoreconfHook, which, defaultIconTheme }: diff --git a/pkgs/applications/graphics/write_stylus/default.nix b/pkgs/applications/graphics/write_stylus/default.nix index a1c39fadb59d..9fd464f46204 100644 --- a/pkgs/applications/graphics/write_stylus/default.nix +++ b/pkgs/applications/graphics/write_stylus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, qtbase, qtsvg, makeWrapper, fetchurl, makeDesktopItem }: +{ stdenv, lib, qtbase, qtsvg, fetchurl, makeDesktopItem }: stdenv.mkDerivation rec { name = "write_stylus-${version}"; version = "209"; @@ -6,7 +6,8 @@ stdenv.mkDerivation rec { desktopItem = makeDesktopItem { name = "Write"; exec = "Write"; - comment = "a word processor for hadwriting"; + comment = "A word processor for handwriting"; + icon = "write_stylus"; desktopName = "Write"; genericName = "Write"; categories = "Office;Graphics"; @@ -16,6 +17,14 @@ stdenv.mkDerivation rec { url = "http://www.styluslabs.com/write/write${version}.tar.gz"; sha256 = "1p6glp4vdpwl8hmhypayc4cvs3j9jfmjfhhrgqm2xkgl5bfbv2qd"; }; + + # taken from: https://www.iconfinder.com/icons/50835/edit_pencil_write_icon + # license: Free for commercial use + icon = fetchurl { + url = "https://oyra.eu/write/icon.tar.gz"; + sha256 = "1zd98g63apwi17qc1hm1g14maain5d18g4afadxm30qjz2s0mvs8"; + }; + sourceRoot = "."; dontBuild = true; @@ -26,6 +35,9 @@ stdenv.mkDerivation rec { # symlink the binary to bin/ ln -s $out/Write/Write $out/bin/Write + # untar icons + tar -xzf ${icon} *.tar.gz -C $out/ + mkdir -p $out/share/applications ln -s ${desktopItem}/share/applications/* $out/share/applications/ ''; diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index a8b4038b11f3..aa2435c43de6 100644 --- a/pkgs/applications/graphics/yed/default.nix +++ b/pkgs/applications/graphics/yed/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, requireFile, makeWrapper, unzip, jre }: +{ stdenv, requireFile, makeWrapper, unzip, jre }: stdenv.mkDerivation rec { name = "yEd-${version}"; |