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

octave: add runtime texinfo dependency

Browse Source 
makeinfo (provided by the texinfo package) is used by the "help"
command in Octave to display info about functions, etc.  By default,
Octave looks for "makeinfo" in the PATH, rather than specifying the
location of the executable.  This results in Nix not being aware that
makeinfo is required at runtime (so unless you happen have makeinfo
available from your path, "help" won't work).

This patch fixes that by setting the path to makeinfo in Octave,
thereby creating a runtime dependency on texinfo.
This commit is contained in:
Alastair Pharo 2017-04-09 16:10:54 +10:00
parent f0ebcc6444
commit 250ddfe1a2
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/interpreters/octave/default.nix
View File

@ -41,9 +41,15 @@ stdenv.mkDerivation rec {
++ (stdenv.lib.optionals (!stdenv.isDarwin) [ mesa libX11 ]) ++ (stdenv.lib.optionals (!stdenv.isDarwin) [ mesa libX11 ])
; ;
# makeinfo is required by Octave at runtime to display help
prePatch = ''
substituteInPlace libinterp/corefcn/help.cc \
--replace 'Vmakeinfo_program = "makeinfo"' \
'Vmakeinfo_program = "${texinfo}/bin/makeinfo"'
''
# REMOVE ON VERSION BUMP # REMOVE ON VERSION BUMP
# Needed for Octave-4.2.1 on darwin. See https://savannah.gnu.org/bugs/?50234 # Needed for Octave-4.2.1 on darwin. See https://savannah.gnu.org/bugs/?50234
prePatch = stdenv.lib.optionalString stdenv.isDarwin '' + stdenv.lib.optionalString stdenv.isDarwin ''
sed 's/inline file_stat::~file_stat () { }/file_stat::~file_stat () { }/' -i ./liboctave/system/file-stat.cc sed 's/inline file_stat::~file_stat () { }/file_stat::~file_stat () { }/' -i ./liboctave/system/file-stat.cc
''; '';