diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2021-01-28 00:40:22 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-28 00:40:22 +0100 |
commit | 6e94aa4281e403e2c5fa9e4b68f9e69b14f2bf3a (patch) | |
tree | cb8f5518bee27e21c2a5fa5036d1e7294dd99477 /pkgs | |
parent | b60a32f0155140c7c2b0b390c7a2c4bddffec43f (diff) | |
parent | df3a19b9d7f408f3ed21842f96fd79ed52c39a20 (diff) | |
download | nixpkgs-6e94aa4281e403e2c5fa9e4b68f9e69b14f2bf3a.tar nixpkgs-6e94aa4281e403e2c5fa9e4b68f9e69b14f2bf3a.tar.gz nixpkgs-6e94aa4281e403e2c5fa9e4b68f9e69b14f2bf3a.tar.bz2 nixpkgs-6e94aa4281e403e2c5fa9e4b68f9e69b14f2bf3a.tar.lz nixpkgs-6e94aa4281e403e2c5fa9e4b68f9e69b14f2bf3a.tar.xz nixpkgs-6e94aa4281e403e2c5fa9e4b68f9e69b14f2bf3a.tar.zst nixpkgs-6e94aa4281e403e2c5fa9e4b68f9e69b14f2bf3a.zip |
Merge pull request #110904 from MetaDark/vkbasalt
vkBasalt: init at 0.3.2.4
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/tools/graphics/vkBasalt/default.nix | 42 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 46 insertions, 0 deletions
diff --git a/pkgs/tools/graphics/vkBasalt/default.nix b/pkgs/tools/graphics/vkBasalt/default.nix new file mode 100644 index 00000000000..50cbe048131 --- /dev/null +++ b/pkgs/tools/graphics/vkBasalt/default.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, fetchFromGitHub +, glslang +, meson +, ninja +, pkg-config +, libX11 +, spirv-headers +, vulkan-headers +, vkBasalt32 +}: + +stdenv.mkDerivation rec { + pname = "vkBasalt"; + version = "0.3.2.4"; + + src = fetchFromGitHub { + owner = "DadSchoorse"; + repo = pname; + rev = "v${version}"; + sha256 = "01iplj6dlw2vl35hyci5m5yp8jmzcwng6c3jk3wn97jpv6m3hjqz"; + }; + + nativeBuildInputs = [ glslang meson ninja pkg-config ]; + buildInputs = [ libX11 spirv-headers vulkan-headers ]; + mesonFlags = [ "-Dappend_libdir_vkbasalt=true" ]; + + # Include 32bit layer in 64bit build + postInstall = lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") '' + ln -s ${vkBasalt32}/share/vulkan/implicit_layer.d/vkBasalt.json \ + "$out/share/vulkan/implicit_layer.d/vkBasalt32.json" + ''; + + meta = with lib; { + description = "A Vulkan post processing layer for Linux"; + homepage = "https://github.com/DadSchoorse/vkBasalt"; + license = licenses.zlib; + maintainers = with maintainers; [ metadark ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e41ffac779..8f35bd95ac1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8604,6 +8604,10 @@ in vix = callPackage ../tools/misc/vix { }; + vkBasalt = callPackage ../tools/graphics/vkBasalt { + vkBasalt32 = pkgsi686Linux.vkBasalt; + }; + vnc2flv = callPackage ../tools/video/vnc2flv {}; vncrec = callPackage ../tools/video/vncrec { }; |