From 86a1b6c41d5f14d2558d849794766dd64cc8e6dc Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Wed, 4 Nov 2020 14:21:32 +0800 Subject: [PATCH] haskellPackages.vulkan-utils: Add necessary dependency on vulkan-headers Also mark as unbroken --- pkgs/development/haskell-modules/configuration-common.nix | 3 ++- .../development/haskell-modules/configuration-hackage2nix.yaml | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ce309376396..41b2080d0d6 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -922,8 +922,9 @@ self: super: { # This package refers to the wrong library (itself in fact!) vulkan = super.vulkan.override { vulkan = pkgs.vulkan-loader; }; - # Compiles some C++ source which requires these headers + # Compiles some C or C++ source which requires these headers VulkanMemoryAllocator = addExtraLibrary super.VulkanMemoryAllocator pkgs.vulkan-headers; + vulkan-utils = addExtraLibrary super.vulkan-utils pkgs.vulkan-headers; # https://github.com/dmwit/encoding/pull/3 encoding = doJailbreak (appendPatch super.encoding ./patches/encoding-Cabal-2.0.patch); diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 13b94368c8c..4cdcd9f3aab 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -10987,7 +10987,6 @@ broken-packages: - vty-menu - vty-ui - vty-ui-extras - - vulkan-utils - waargonaut - wacom-daemon - waddle