diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-07-14 18:12:49 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-07-14 18:15:30 +0200 |
commit | 0f01215203e3886d1a57ced4cd49b54475c66f85 (patch) | |
tree | 3cca5bbb2d7f79724f211d476d6a3e14d0ddf92d /pkgs/tools/graphics | |
parent | 4bd4e3ef5c13c97ad829d18d8fe99dd753b33da5 (diff) | |
parent | 6d0578934fb076050b3dcc1b924a90b275f3b27c (diff) | |
download | nixlib-0f01215203e3886d1a57ced4cd49b54475c66f85.tar nixlib-0f01215203e3886d1a57ced4cd49b54475c66f85.tar.gz nixlib-0f01215203e3886d1a57ced4cd49b54475c66f85.tar.bz2 nixlib-0f01215203e3886d1a57ced4cd49b54475c66f85.tar.lz nixlib-0f01215203e3886d1a57ced4cd49b54475c66f85.tar.xz nixlib-0f01215203e3886d1a57ced4cd49b54475c66f85.tar.zst nixlib-0f01215203e3886d1a57ced4cd49b54475c66f85.zip |
Merge branch 'master' into staging-next
Hydra: ?compare=1468896
Diffstat (limited to 'pkgs/tools/graphics')
-rw-r--r-- | pkgs/tools/graphics/appleseed/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/graphics/luxcorerender/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/graphics/pngquant/default.nix | 13 | ||||
-rw-r--r-- | pkgs/tools/graphics/pstoedit/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/graphics/pstoedit/pstoedit-gs-9.22-compat.patch | 13 | ||||
-rw-r--r-- | pkgs/tools/graphics/structure-synth/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/graphics/vulkan-tools/default.nix | 2 |
7 files changed, 32 insertions, 13 deletions
diff --git a/pkgs/tools/graphics/appleseed/default.nix b/pkgs/tools/graphics/appleseed/default.nix index e4b31f06b6e4..56091a89e48b 100644 --- a/pkgs/tools/graphics/appleseed/default.nix +++ b/pkgs/tools/graphics/appleseed/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, guile, -eigen3_3, libpng, python, mesa_glu, qt4, openexr, openimageio, +eigen3_3, libpng, python, libGLU, qt4, openexr, openimageio, opencolorio, xercesc, ilmbase, osl, seexpr }: @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { }; buildInputs = [ cmake pkgconfig boost_static guile eigen3_3 libpng python - mesa_glu qt4 openexr openimageio opencolorio xercesc + libGLU qt4 openexr openimageio opencolorio xercesc osl seexpr ]; diff --git a/pkgs/tools/graphics/luxcorerender/default.nix b/pkgs/tools/graphics/luxcorerender/default.nix index 3611356627a2..0492164dfa36 100644 --- a/pkgs/tools/graphics/luxcorerender/default.nix +++ b/pkgs/tools/graphics/luxcorerender/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, python35 , tbb, openimageio, libjpeg, libpng, zlib, libtiff, ilmbase , freetype, openexr, libXdmcp, libxkbcommon, epoxy, at-spi2-core -, dbus, doxygen, qt5, c-blosc, mesa_glu, gnome3, pcre +, dbus, doxygen, qt5, c-blosc, libGLU, gnome3, pcre , bison, flex, libpthreadstubs, libX11 , embree2, makeWrapper, gsettings_desktop_schemas, glib , withOpenCL ? true , opencl-headers, ocl-icd, opencl-clhpp @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { buildInputs = [ embree2 pkgconfig cmake zlib boost_static libjpeg libtiff libpng ilmbase freetype openexr openimageio - tbb qt5.full c-blosc mesa_glu pcre bison + tbb qt5.full c-blosc libGLU pcre bison flex libX11 libpthreadstubs python35 libXdmcp libxkbcommon epoxy at-spi2-core dbus doxygen # needed for GSETTINGS_SCHEMAS_PATH diff --git a/pkgs/tools/graphics/pngquant/default.nix b/pkgs/tools/graphics/pngquant/default.nix index b53a07bcfadf..4e7d1e361f91 100644 --- a/pkgs/tools/graphics/pngquant/default.nix +++ b/pkgs/tools/graphics/pngquant/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchgit, pkgconfig, libpng, zlib, lcms2 }: +{ stdenv, fetchFromGitHub, pkgconfig, libpng, zlib, lcms2 }: stdenv.mkDerivation rec { name = "pngquant-${version}"; - version = "2.11.7"; + version = "2.12.1"; - src = fetchgit { - url = "https://www.github.com/pornel/pngquant.git"; - rev = "refs/tags/${version}"; - sha256 = "1qr5qr2wznzp0v9xwyz4r3982rcm9kys913w8gwmv7qd1akvx2qh"; + src = fetchFromGitHub { + owner = "pornel"; + repo = "pngquant"; + rev = version; + sha256 = "0jdvry3kvmmxcgwf5a3zbfz0idl6yl3700ag7pf8sk4lg4qp0llp"; fetchSubmodules = true; }; diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/tools/graphics/pstoedit/default.nix index 623415a314b5..4f3e5271183d 100644 --- a/pkgs/tools/graphics/pstoedit/default.nix +++ b/pkgs/tools/graphics/pstoedit/default.nix @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { sha256 = "147jkgvm9n6mbkl6ndqnm9x74x5y9agbxkfwj0jrw6yxyhxx2cdd"; }; + # + # Turn on "-rdb" option (REALLYDELAYBIND) by default to ensure compatibility with gs-9.22 + # + patches = [ ./pstoedit-gs-9.22-compat.patch ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ zlib ghostscript imagemagick plotutils gd libjpeg libwebp ] diff --git a/pkgs/tools/graphics/pstoedit/pstoedit-gs-9.22-compat.patch b/pkgs/tools/graphics/pstoedit/pstoedit-gs-9.22-compat.patch new file mode 100644 index 000000000000..64fe805d5015 --- /dev/null +++ b/pkgs/tools/graphics/pstoedit/pstoedit-gs-9.22-compat.patch @@ -0,0 +1,13 @@ +diff --git a/src/pstoeditoptions.h b/src/pstoeditoptions.h +index 7846883..0fb6a6f 100755 +--- a/src/pstoeditoptions.h ++++ b/src/pstoeditoptions.h +@@ -453,7 +453,7 @@ private: + "Later versions of Ghostscript will probably support -dDELAYBIND again. " + "But also in that case the security risk remains. So be careful with what " + "files you process with pstoedit and Ghostscript.", +- false), // ++ true), // + #endif + pagetoextract (true, "-page","page number",g_t,"extract a specific page: 0 means all pages", + "Select a single page from a multi-page PostScript or PDF file.", diff --git a/pkgs/tools/graphics/structure-synth/default.nix b/pkgs/tools/graphics/structure-synth/default.nix index 92a7d69aa915..c1e6c2afecce 100644 --- a/pkgs/tools/graphics/structure-synth/default.nix +++ b/pkgs/tools/graphics/structure-synth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, qmake4Hook, unzip, mesa_glu, makeWrapper }: +{ stdenv, fetchurl, qt4, qmake4Hook, unzip, libGLU, makeWrapper }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1kiammx46719az6jzrav8yrwz82nk4m72ybj0kpbnvp9wfl3swbb"; }; - buildInputs = [ qt4 unzip mesa_glu makeWrapper ]; + buildInputs = [ qt4 unzip libGLU makeWrapper ]; nativeBuildInputs = [ qmake4Hook ]; # Thanks to https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672000#15: diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index 4e4f5a5db4a6..778a12341540 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "LunarG Vulkan loader"; - homepage = "http://www.lunarg.com"; + homepage = https://www.lunarg.com; platforms = platforms.linux; license = licenses.asl20; maintainers = [ maintainers.ralith ]; |