diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2c07385cb49a..1cdae8525f4e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -835,13 +835,6 @@ with haskellLib; # Tests require a Kafka broker running locally haskakafka = dontCheck super.haskakafka; - bindings-levmar = addExtraLibrary pkgs.blas super.bindings-levmar; - - # Requires wrapQtAppsHook - qtah-cpp-qt5 = overrideCabal (drv: { - buildDepends = [ pkgs.qt5.wrapQtAppsHook ]; - }) super.qtah-cpp-qt5; - # The Haddock phase fails for one reason or another. deepseq-magic = dontHaddock super.deepseq-magic; feldspar-signal = dontHaddock super.feldspar-signal; # https://github.com/markus-git/feldspar-signal/issues/1 @@ -1211,9 +1204,6 @@ with haskellLib; # https://github.com/pixbi/duplo/issues/25 duplo = doJailbreak super.duplo; - # https://github.com/evanrinehart/mikmod/issues/1 - mikmod = addExtraLibrary pkgs.libmikmod super.mikmod; - # Missing module. rematch = dontCheck super.rematch; # https://github.com/tcrayford/rematch/issues/5 rematch-text = dontCheck super.rematch-text; # https://github.com/tcrayford/rematch/issues/6 @@ -1519,10 +1509,6 @@ with haskellLib; preCheck = ''export PATH="$PWD/dist/build/alex:$PATH"''; }) super.alex; - # Compiles some C or C++ source which requires these headers - VulkanMemoryAllocator = addExtraLibrary pkgs.vulkan-headers super.VulkanMemoryAllocator; - vulkan-utils = addExtraLibrary pkgs.vulkan-headers super.vulkan-utils; - # Generate cli completions for dhall. dhall = self.generateOptparseApplicativeCompletions [ "dhall" ] super.dhall; # 2025-01-27: allow aeson >= 2.2, 9.8 versions of text and bytestring diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 82574796ebc6..cc7657c45e8b 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -214,6 +214,18 @@ builtins.intersectAttrs super { ''; }) super.cuda; + # Compiles some C or C++ source which requires these headers + VulkanMemoryAllocator = addExtraLibrary pkgs.vulkan-headers super.VulkanMemoryAllocator; + vulkan-utils = addExtraLibrary pkgs.vulkan-headers super.vulkan-utils; + + # Requires wrapQtAppsHook + qtah-cpp-qt5 = overrideCabal (drv: { + buildDepends = [ pkgs.qt5.wrapQtAppsHook ]; + }) super.qtah-cpp-qt5; + + # https://github.com/evanrinehart/mikmod/issues/1 + mikmod = addExtraLibrary pkgs.libmikmod super.mikmod; + nvvm = overrideCabal (drv: { preConfigure = '' export CUDA_PATH=${pkgs.cudatoolkit} @@ -384,6 +396,9 @@ builtins.intersectAttrs super { addBuildDepends [ pkgs.double-conversion ] super.double-conversion ); + # library dependency declaration hidden behind conditional + bindings-levmar = addExtraLibrary pkgs.blas super.bindings-levmar; + # https://github.com/NixOS/cabal2nix/issues/136 and https://github.com/NixOS/cabal2nix/issues/216 gio = lib.pipe super.gio [ (disableHardening [ "fortify" ])