diff options
Diffstat (limited to 'pkgs/tools/graphics')
8 files changed, 76 insertions, 18 deletions
diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 9950d3c56f99..795378d370c2 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, fetchurl, fetchpatch -, autoreconfHook, bison, glm, flex +, autoreconfHook, bison, glm, flex, wrapQtAppsHook, cmake , freeglut, ghostscriptX, imagemagick, fftw , boehmgc, libGLU, libGL, mesa, ncurses, readline, gsl, libsigsegv -, python3Packages +, python3, qtbase, qtsvg, boost , zlib, perl, curl , texLive, texinfo , darwin @@ -25,17 +25,17 @@ stdenv.mkDerivation rec { flex bison texinfo + wrapQtAppsHook + cmake ]; buildInputs = [ ghostscriptX imagemagick fftw boehmgc ncurses readline gsl libsigsegv - zlib perl curl + zlib perl curl qtbase qtsvg boost texLive - ] ++ (with python3Packages; [ - python - pyqt5 - ]); + (python3.withPackages (ps: with ps; [ cson numpy pyqt5 ])) + ]; propagatedBuildInputs = [ glm @@ -45,6 +45,8 @@ stdenv.mkDerivation rec { OpenGL GLUT Cocoa ]); + dontWrapQtApps = true; + preConfigure = '' HOME=$TMP ''; @@ -57,6 +59,9 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-I${boehmgc.dev}/include/gc"; postInstall = '' + rm "$out"/bin/xasy + makeQtWrapper "$out"/share/asymptote/GUI/xasy.py "$out"/bin/xasy --prefix PATH : "$out"/bin + mv $out/share/info/asymptote/*.info $out/share/info/ sed -i -e 's|(asymptote/asymptote)|(asymptote)|' $out/share/info/asymptote.info rmdir $out/share/info/asymptote @@ -66,6 +71,8 @@ stdenv.mkDerivation rec { install -Dt $out/share/emacs/site-lisp/${pname} $out/share/asymptote/*.el ''; + dontUseCmakeConfigure = true; + enableParallelBuilding = true; # Missing install depends: # ...-coreutils-9.1/bin/install: cannot stat 'asy-keywords.el': No such file or directory diff --git a/pkgs/tools/graphics/spirv-cross/default.nix b/pkgs/tools/graphics/spirv-cross/default.nix index c4dcd2684912..265c6365d6fb 100644 --- a/pkgs/tools/graphics/spirv-cross/default.nix +++ b/pkgs/tools/graphics/spirv-cross/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "spirv-cross"; - version = "1.3.243.0"; + version = "1.3.250.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Cross"; rev = "sdk-${finalAttrs.version}"; - hash = "sha256-snxbTI4q0YQq8T5NQD3kcsN59iJnhlLiu1Fvr+fCDeQ="; + hash = "sha256-H4UkR/EiBWpdhdPHNBrdRkl4eN8kD9gEOzpnwfFSdpI="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/pkgs/tools/graphics/ueberzugpp/default.nix b/pkgs/tools/graphics/ueberzugpp/default.nix index 919540b949e1..3fa206d8866e 100644 --- a/pkgs/tools/graphics/ueberzugpp/default.nix +++ b/pkgs/tools/graphics/ueberzugpp/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "ueberzugpp"; - version = "2.8.7"; + version = "2.8.8"; src = fetchFromGitHub { owner = "jstkdng"; repo = "ueberzugpp"; rev = "v${version}"; - hash = "sha256-grkLsbatgezM8wFbwAatLQw35wucU0Kc6hacRefFvHw="; + hash = "sha256-HvcH8ysH43i87so758m6QD+AuNfTiOdo5knI+3PBO8U="; }; # error: no member named 'ranges' in namespace 'std' diff --git a/pkgs/tools/graphics/vulkan-extension-layer/default.nix b/pkgs/tools/graphics/vulkan-extension-layer/default.nix index 81e2f329d1b5..68ef3eddee5d 100644 --- a/pkgs/tools/graphics/vulkan-extension-layer/default.nix +++ b/pkgs/tools/graphics/vulkan-extension-layer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "vulkan-extension-layer"; - version = "1.3.248"; + version = "1.3.254"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ExtensionLayer"; rev = "v${version}"; - hash = "sha256-CuwYpB8HX8pnR+ElkQfckpKDLKyZIzqm4F9kluM1cKo="; + hash = "sha256-YWJk0sAvhmfVbJ6Nv24kzFL4SltQnggNjZ+NjaUO1Io="; }; nativeBuildInputs = [ cmake jq ]; diff --git a/pkgs/tools/graphics/vulkan-tools-lunarg/add-missing-macro-definition.patch b/pkgs/tools/graphics/vulkan-tools-lunarg/add-missing-macro-definition.patch new file mode 100644 index 000000000000..4d5717363303 --- /dev/null +++ b/pkgs/tools/graphics/vulkan-tools-lunarg/add-missing-macro-definition.patch @@ -0,0 +1,26 @@ +diff --git a/layersvt/api_dump.h b/layersvt/api_dump.h +index 6e13b6de3..33bee96e7 100644 +--- a/layersvt/api_dump.h ++++ b/layersvt/api_dump.h +@@ -60,6 +60,8 @@ + #include <unordered_set> + #include <utility> + ++#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) ++ + #ifdef ANDROID + + #include <android/log.h> +diff --git a/layersvt/screenshot.cpp b/layersvt/screenshot.cpp +index b9743371c..6ee65c576 100755 +--- a/layersvt/screenshot.cpp ++++ b/layersvt/screenshot.cpp +@@ -44,6 +44,8 @@ using namespace std; + + #include "screenshot_parsing.h" + ++#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) ++ + #ifdef ANDROID + + #include <android/log.h> diff --git a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix index 88058d2caa3b..8dec2e5130e7 100644 --- a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix +++ b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "vulkan-tools-lunarg"; - version = "1.3.249"; + version = "1.3.250"; src = fetchFromGitHub { owner = "LunarG"; repo = "VulkanTools"; rev = "v${version}"; - hash = "sha256-yQE6tjUxIZEMspxDaO9AoSjoEHQl2eDAc0E/aVQZnxQ="; + hash = "sha256-oI2ITvciuE/f8ojFpIwcH+HnYCasz43nKkER3wJxX+c="; fetchSubmodules = true; }; @@ -81,7 +81,17 @@ stdenv.mkDerivation rec { done ''; - patches = [ ./gtest.patch ]; + patches = [ + # Redefine an internal macro removed in vulkan-validation-layers + # FIXME: remove when fixed upstream + ./add-missing-macro-definition.patch + + # Skip QNX-specific extension causing build failures + # FIXME: remove when fixed upstream + ./skip-qnx-extension.patch + + ./gtest.patch + ]; # Same as vulkan-validation-layers dontPatchELF = true; diff --git a/pkgs/tools/graphics/vulkan-tools-lunarg/skip-qnx-extension.patch b/pkgs/tools/graphics/vulkan-tools-lunarg/skip-qnx-extension.patch new file mode 100644 index 000000000000..777b32f43af4 --- /dev/null +++ b/pkgs/tools/graphics/vulkan-tools-lunarg/skip-qnx-extension.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 209f3ec39..c711af38b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -190,7 +190,7 @@ endif() + # Define macro used for building vk.xml generated files + function(run_vulkantools_vk_xml_generate dependency output) + add_custom_command(OUTPUT ${output} +- COMMAND ${PYTHON_CMD} -B ${VULKANTOOLS_SCRIPTS_DIR}/vt_genvk.py -registry ${VULKAN_HEADERS_REGISTRY_DIRECTORY}/vk.xml -scripts ${VULKAN_HEADERS_REGISTRY_DIRECTORY} ${output} ++ COMMAND ${PYTHON_CMD} -B ${VULKANTOOLS_SCRIPTS_DIR}/vt_genvk.py -registry ${VULKAN_HEADERS_REGISTRY_DIRECTORY}/vk.xml -scripts ${VULKAN_HEADERS_REGISTRY_DIRECTORY} ${output} -removeExtensions VK_QNX_external_memory_screen_buffer + DEPENDS ${VULKAN_HEADERS_REGISTRY_DIRECTORY}/vk.xml ${VULKAN_HEADERS_REGISTRY_DIRECTORY}/generator.py ${VULKANTOOLS_SCRIPTS_DIR}/${dependency} ${VULKANTOOLS_SCRIPTS_DIR}/vt_genvk.py ${VULKAN_HEADERS_REGISTRY_DIRECTORY}/reg.py + ) + endfunction() diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index d3ffe35ff964..3f36e8abf7f9 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , cmake , pkg-config +, python3 , glslang , libffi , libX11 @@ -21,18 +22,19 @@ stdenv.mkDerivation rec { pname = "vulkan-tools"; - version = "1.3.249"; + version = "1.3.254"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Tools"; rev = "v${version}"; - hash = "sha256-+d0Yp+e/wzlRmUIs4SffiphkqmM/7avJrt3JNOgO19I="; + hash = "sha256-MyYngyoIGpGu1jFN1GDm9BcFye1JRz1cN6SaZue1ZGQ="; }; nativeBuildInputs = [ cmake pkg-config + python3 ]; buildInputs = [ |