diff options
Diffstat (limited to 'pkgs/tools/graphics')
-rw-r--r-- | pkgs/tools/graphics/imgur-screenshot/default.nix | 10 | ||||
-rw-r--r-- | pkgs/tools/graphics/resvg/default.nix | 24 | ||||
-rw-r--r-- | pkgs/tools/graphics/vulkan-tools/default.nix | 21 |
3 files changed, 45 insertions, 10 deletions
diff --git a/pkgs/tools/graphics/imgur-screenshot/default.nix b/pkgs/tools/graphics/imgur-screenshot/default.nix index c994ee02811e..1a211ebd857f 100644 --- a/pkgs/tools/graphics/imgur-screenshot/default.nix +++ b/pkgs/tools/graphics/imgur-screenshot/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchFromGitHub, makeWrapper, curl, gnugrep, libnotify, scrot, which, xclip }: +{ stdenv, fetchFromGitHub, makeWrapper, curl, jq, gnugrep, libnotify, scrot, which, xclip }: -let deps = stdenv.lib.makeBinPath [ curl gnugrep libnotify scrot which xclip ]; +let deps = stdenv.lib.makeBinPath [ curl jq gnugrep libnotify scrot which xclip ]; in stdenv.mkDerivation rec { - version = "1.7.4"; + version = "2.0.0"; pname = "imgur-screenshot"; src = fetchFromGitHub { owner = "jomo"; repo = "imgur-screenshot"; rev = "v${version}"; - sha256 = "1bhi9sk8v7szh2fj13qwvdwzy5dw2w4kml86sy1ns1rn0xin0cgr"; + sha256 = "0fkhvfraijbrw806pgij41bn1hc3r7l7l3snkicmshxj83lmsd5k"; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' - install -Dm755 imgur-screenshot.sh $out/bin/imgur-screenshot + install -Dm755 imgur-screenshot $out/bin/imgur-screenshot wrapProgram $out/bin/imgur-screenshot --prefix PATH ':' ${deps} ''; diff --git a/pkgs/tools/graphics/resvg/default.nix b/pkgs/tools/graphics/resvg/default.nix new file mode 100644 index 000000000000..ea6a75eb3a55 --- /dev/null +++ b/pkgs/tools/graphics/resvg/default.nix @@ -0,0 +1,24 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "resvg"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "RazrFalcon"; + repo = pname; + rev = "v${version}"; + sha256 = "1qaca8wqwi2wqqx1yladjb4clgqdzsm8b7qsiaw0qascddjw1mcc"; + }; + + cargoSha256 = "1y10xzdf5kxbi9930qfsmryrbrkx1wmc5b216l9wcxq6cd77hxy2"; + + doCheck = false; + + meta = with lib; { + description = "An SVG rendering library"; + homepage = "https://github.com/RazrFalcon/resvg"; + license = licenses.mpl20; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index 71bcdc2e2691..e320e4e6ef3b 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -1,22 +1,33 @@ -{ stdenv, fetchFromGitHub, cmake, python3, vulkan-loader, vulkan-headers, - glslang, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }: +{ stdenv, lib, fetchFromGitHub, cmake, python3, vulkan-loader, + vulkan-headers, glslang, pkgconfig, xlibsWrapper, libxcb, + libXrandr, wayland }: stdenv.mkDerivation rec { pname = "vulkan-tools"; - version = "1.2.131.1"; + version = "1.2.141.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Tools"; rev = "sdk-${version}"; - sha256 = "0ws47ansrr8cq4qjf6k4q0ygm9wwd3w7mhwqcl1qxms8lh5vmhfq"; + sha256 = "1ch56ihm7rmilipfyc4i4ww7l6i20fb3qikkpm1ch43kzn42zjaw"; }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ python3 vulkan-headers vulkan-loader xlibsWrapper libxcb libXrandr wayland ]; enableParallelBuilding = true; - cmakeFlags = [ "-DBUILD_ICD=OFF" "-DGLSLANG_INSTALL_DIR=${glslang}" ]; + libraryPath = lib.strings.makeLibraryPath [ vulkan-loader ]; + + dontPatchELF = true; + + cmakeFlags = [ + # Don't build the mock ICD as it may get used instead of other drivers, if installed + "-DBUILD_ICD=OFF" + "-DGLSLANG_INSTALL_DIR=${glslang}" + # vulkaninfo loads libvulkan using dlopen, so we have to add it manually to RPATH + "-DCMAKE_INSTALL_RPATH=${libraryPath}" + ]; meta = with stdenv.lib; { description = "LunarG Vulkan loader"; |