From b66892931e079610f99cf09bba662446167ec71a Mon Sep 17 00:00:00 2001 From: Reuben D'Netto Date: Fri, 9 Mar 2018 18:33:28 +1100 Subject: [PATCH] haskellPackages.cuda: Fixed broken dependency --- pkgs/development/haskell-modules/configuration-nix.nix | 5 ++--- pkgs/development/haskell-modules/hackage-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 28ccb81f2dc..199b9c17654 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -58,9 +58,8 @@ self: super: builtins.intersectAttrs super { # CUDA needs help finding the SDK headers and libraries. cuda = overrideCabal super.cuda (drv: { extraLibraries = (drv.extraLibraries or []) ++ [pkgs.linuxPackages.nvidia_x11]; - configureFlags = (drv.configureFlags or []) ++ - pkgs.lib.optional pkgs.stdenv.is64bit "--extra-lib-dirs=${pkgs.cudatoolkit}/lib64" ++ [ - "--extra-lib-dirs=${pkgs.cudatoolkit}/lib" + configureFlags = (drv.configureFlags or []) ++ [ + "--extra-lib-dirs=${pkgs.cudatoolkit.lib}/lib" "--extra-include-dirs=${pkgs.cudatoolkit}/include" ]; preConfigure = '' diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 40f28fc4d8d..f5da1bef482 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -54803,8 +54803,8 @@ self: { }: mkDerivation { pname = "cuda"; - version = "0.9.0.1"; - sha256 = "1ldn1jd12kisx6dgz5q50l6hx5aqakwj9vq2fbnx21ri309vlyq8"; + version = "0.9.0.2"; + sha256 = "0l7dpvpr6k0nm7fardga2cyc9ivvv67yndnxpmixifrhdsbm8hvc"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ];