Skip to content

Commit 925634d

Browse files
committed
nix: Avoid using cuda version in name unless enableCuda is set
Also match the configureFlags in the python to those used in the lib. But probably we're going to have to generate everything at once (one source package, but potentially multiple outputs).
1 parent b006b55 commit 925634d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

flake.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
mkpname = basename:
3939
{ enableDebug ? false, enableCuda ? false, cudatoolkit ? null }:
4040
basename + lib.optionalString enableCuda "-cuda"
41-
+ lib.optionalString (cudatoolkit != null)
41+
+ lib.optionalString (enableCuda && cudatoolkit != null)
4242
(lib.versions.major cudatoolkit.version
4343
+ lib.versions.minor cudatoolkit.version)
4444
+ lib.optionalString enableDebug "-debug";
@@ -137,7 +137,7 @@
137137
# generating and tweaking the generated ‘libbifrost’ interface. Then
138138
# also patch ‘add_library_search_dirs’.
139139
patchPhase = ''
140-
./configure
140+
./configure ${lib.concatStringsSep " " libbifrost.configureFlags}
141141
cd python
142142
make bifrost/libbifrost_generated.py
143143
sed -i \

0 commit comments

Comments
 (0)