Skip to content

Commit 2e4add7

Browse files
committed
openmpi: tweak the conditional postFixup
1 parent 077a14f commit 2e4add7

File tree

1 file changed

+9
-12
lines changed

1 file changed

+9
-12
lines changed

pkgs/by-name/op/openmpi/package.nix

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -250,19 +250,16 @@ stdenv.mkDerivation (finalAttrs: {
250250
done
251251
'';
252252

253-
postFixup =
254-
lib.optionalString (lib.elem "man" finalAttrs.outputs) ''
255-
remove-references-to -t "''${!outputMan}" $(readlink -f $out/lib/libopen-pal${stdenv.hostPlatform.extensions.library})
256-
''
257-
+ lib.optionalString (lib.elem "dev" finalAttrs.outputs) ''
258-
remove-references-to -t "''${!outputDev}" $out/bin/mpirun
259-
remove-references-to -t "''${!outputDev}" $(readlink -f $out/lib/libopen-pal${stdenv.hostPlatform.extensions.library})
253+
postFixup = ''
254+
remove-references-to -t "''${!outputMan}" $(readlink -f $out/lib/libopen-pal${stdenv.hostPlatform.extensions.library})
255+
remove-references-to -t "''${!outputDev}" $out/bin/mpirun
256+
remove-references-to -t "''${!outputDev}" $(readlink -f $out/lib/libopen-pal${stdenv.hostPlatform.extensions.library})
260257
261-
# The path to the wrapper is hard coded in libopen-pal.so, which we just cleared.
262-
wrapProgram "''${!outputDev}/bin/opal_wrapper" \
263-
--set OPAL_INCLUDEDIR "''${!outputDev}/include" \
264-
--set OPAL_PKGDATADIR "''${!outputDev}/share/openmpi"
265-
'';
258+
# The path to the wrapper is hard coded in libopen-pal.so, which we just cleared.
259+
wrapProgram "''${!outputDev}/bin/opal_wrapper" \
260+
--set OPAL_INCLUDEDIR "''${!outputDev}/include" \
261+
--set OPAL_PKGDATADIR "''${!outputDev}/share/openmpi"
262+
'';
266263

267264
doCheck = true;
268265

0 commit comments

Comments
 (0)