From ac66a6c23a70a089a3182c7fb519277e1fdd67d6 Mon Sep 17 00:00:00 2001 From: SCOTT-HAMILTON Date: Mon, 1 Aug 2022 18:31:16 +0200 Subject: [PATCH 1/3] vk-bootstrap: init at 0.5 --- .../libraries/vk-bootstrap/default.nix | 42 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/libraries/vk-bootstrap/default.nix diff --git a/pkgs/development/libraries/vk-bootstrap/default.nix b/pkgs/development/libraries/vk-bootstrap/default.nix new file mode 100644 index 000000000000..d5e3fe5ac578 --- /dev/null +++ b/pkgs/development/libraries/vk-bootstrap/default.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, vulkan-headers +, glfw +, catch2 +}: + +stdenv.mkDerivation rec { + pname = "vk-bootstrap"; + version = "0.5"; + + src = fetchFromGitHub { + owner = "charles-lunarg"; + repo = "vk-bootstrap"; + rev = "v${version}"; + sha256 = "sha256-rKyfUWfRYiVNzLWh6y44ASHW4j+yabY0kZTdZi8j2Dc="; + }; + + postPatch = '' + # Upstream uses cmake FetchContent to resolve glfw and catch2 + # needed for examples and tests + sed -iE 's=add_subdirectory(ext)==g' CMakeLists.txt + sed -iE 's=Catch2==g' tests/CMakeLists.txt + ''; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ vulkan-headers glfw catch2 ]; + + cmakeFlags = [ + "-DVK_BOOTSTRAP_VULKAN_HEADER_DIR=${vulkan-headers}/include" + ]; + + meta = with lib; { + description = "Vulkan Bootstrapping Iibrary"; + license = licenses.mit; + homepage = "https://github.com/charles-lunarg/vk-bootstrap"; + maintainers = with maintainers; [ shamilton ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ce94bb7392ea..f074d684b7af 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11618,6 +11618,8 @@ with pkgs; vdmfec = callPackage ../applications/backup/vdmfec {}; + vk-bootstrap = callPackage ../development/libraries/vk-bootstrap { }; + vk-cli = callPackage ../applications/networking/instant-messengers/vk-cli { }; vk-messenger = callPackage ../applications/networking/instant-messengers/vk-messenger {}; From 20c0b77e25c7649edcb11566d613a21602fa88b3 Mon Sep 17 00:00:00 2001 From: SCOTT-HAMILTON Date: Sun, 7 Aug 2022 10:54:37 +0200 Subject: [PATCH 2/3] Update pkgs/development/libraries/vk-bootstrap/default.nix Co-authored-by: Peder Bergebakken Sundt --- pkgs/development/libraries/vk-bootstrap/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/vk-bootstrap/default.nix b/pkgs/development/libraries/vk-bootstrap/default.nix index d5e3fe5ac578..d45848a46904 100644 --- a/pkgs/development/libraries/vk-bootstrap/default.nix +++ b/pkgs/development/libraries/vk-bootstrap/default.nix @@ -10,6 +10,7 @@ stdenv.mkDerivation rec { pname = "vk-bootstrap"; version = "0.5"; + outputs = [ "out" "dev" ]; src = fetchFromGitHub { owner = "charles-lunarg"; From 14a7e7154b84367814064573fd20f72da108aae4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Sun, 23 Oct 2022 14:46:50 +1100 Subject: [PATCH 3/3] vk-bootstrap: fix description typo --- pkgs/development/libraries/vk-bootstrap/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/vk-bootstrap/default.nix b/pkgs/development/libraries/vk-bootstrap/default.nix index d45848a46904..8b7ce6cd930a 100644 --- a/pkgs/development/libraries/vk-bootstrap/default.nix +++ b/pkgs/development/libraries/vk-bootstrap/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "Vulkan Bootstrapping Iibrary"; + description = "Vulkan Bootstrapping Library"; license = licenses.mit; homepage = "https://github.com/charles-lunarg/vk-bootstrap"; maintainers = with maintainers; [ shamilton ];