Skip to content

Commit

Permalink
octave: Do not --enable-link-all-dependencies on Darwin
Browse files Browse the repository at this point in the history
It seems like upstream Octave removed the requirement that Darwin
default to linking all of its dependencies[1]. Some packages (ltfat)
cannot link against Octave for some reason. Removing this optinal
configure flag fixes this issue.

[1] gnu-octave/octave@d4479bd
  • Loading branch information
KarlJoad committed Dec 27, 2024
1 parent 97d00ed commit d788985
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 5 deletions.
4 changes: 0 additions & 4 deletions pkgs/development/interpreters/octave/build-octave-package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,6 @@ stdenv.mkDerivation (
else
preBuild;

# Add Octave's shared objects to ld library path for some packages which
# need to link their C/C++/Fortran code against Octave's internals.
LD_LIBRARY_PATH = lib.makeLibraryPath nativeBuildInputs';

buildPhase = ''
runHook preBuild
Expand Down
1 change: 0 additions & 1 deletion pkgs/development/interpreters/octave/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,6 @@ stdenv.mkDerivation (finalAttrs: {
"--with-lapack=lapack"
(if use64BitIdx then "--enable-64" else "--disable-64")
]
++ lib.optionals stdenv.hostPlatform.isDarwin [ "--enable-link-all-dependencies" ]
++ lib.optionals enableReadline [ "--enable-readline" ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ "--with-x=no" ]
++ lib.optionals enableQt [ "--with-qt=5" ];
Expand Down

0 comments on commit d788985

Please sign in to comment.