JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #36615 from rdnetto/cuda_fixes

Browse Source 
haskellPackages.cuda: Fixed broken dependency
This commit is contained in:
Peter Simons 2018-03-09 11:29:29 +01:00 committed by GitHub
commit 9132156ae4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -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 = ''

4
pkgs/development/haskell-modules/hackage-packages.nix
View File

@ -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 ];