softmaker-office: add additional programs to PATH
These seem to be needed for the SoftMaker/FreeOffice unlock code. If they are not added to PATH, startup takes a very long time and reports many segmentation faults. Fixes #71228.
This commit is contained in:
parent
e3b407e555
commit
c342e5a6dc
@ -7,6 +7,9 @@
|
|||||||
# product unlocking.
|
# product unlocking.
|
||||||
, coreutils, libredirect
|
, coreutils, libredirect
|
||||||
|
|
||||||
|
# Extra utilities used by the SoftMaker applications.
|
||||||
|
, gnugrep, utillinux, which
|
||||||
|
|
||||||
, pname, version, edition, suiteName, src, archive
|
, pname, version, edition, suiteName, src, archive
|
||||||
|
|
||||||
, ...
|
, ...
|
||||||
@ -59,13 +62,17 @@ in stdenv.mkDerivation {
|
|||||||
# procedure fails. This works around that by rewriting /bin/ls
|
# procedure fails. This works around that by rewriting /bin/ls
|
||||||
# to the proper path.
|
# to the proper path.
|
||||||
#
|
#
|
||||||
|
# In addition, it expects some common utilities (which, whereis)
|
||||||
|
# to be in the path.
|
||||||
|
#
|
||||||
# SoftMaker Office restarts itself upon some operations, such
|
# SoftMaker Office restarts itself upon some operations, such
|
||||||
# changing the theme and unlocking. Unfortunately, we do not
|
# changing the theme and unlocking. Unfortunately, we do not
|
||||||
# have control over its environment then and it will fail
|
# have control over its environment then and it will fail
|
||||||
# with an error.
|
# with an error.
|
||||||
lsIntercept = ''
|
extraWrapperArgs = ''
|
||||||
--set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
|
--set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
|
||||||
--set NIX_REDIRECTS "/bin/ls=${coreutils}/bin/ls"
|
--set NIX_REDIRECTS "/bin/ls=${coreutils}/bin/ls" \
|
||||||
|
--prefix PATH : "${stdenv.lib.makeBinPath [ coreutils gnugrep utillinux which ]}"
|
||||||
'';
|
'';
|
||||||
in ''
|
in ''
|
||||||
runHook preInstall
|
runHook preInstall
|
||||||
@ -77,11 +84,11 @@ in stdenv.mkDerivation {
|
|||||||
# their resource path.
|
# their resource path.
|
||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
makeWrapper $out/share/${pname}${edition}/planmaker $out/bin/${pname}-planmaker \
|
makeWrapper $out/share/${pname}${edition}/planmaker $out/bin/${pname}-planmaker \
|
||||||
${lsIntercept}
|
${extraWrapperArgs}
|
||||||
makeWrapper $out/share/${pname}${edition}/presentations $out/bin/${pname}-presentations \
|
makeWrapper $out/share/${pname}${edition}/presentations $out/bin/${pname}-presentations \
|
||||||
${lsIntercept}
|
${extraWrapperArgs}
|
||||||
makeWrapper $out/share/${pname}${edition}/textmaker $out/bin/${pname}-textmaker \
|
makeWrapper $out/share/${pname}${edition}/textmaker $out/bin/${pname}-textmaker \
|
||||||
${lsIntercept}
|
${extraWrapperArgs}
|
||||||
|
|
||||||
for size in 16 32 48 64 96 128 256 512 1024; do
|
for size in 16 32 48 64 96 128 256 512 1024; do
|
||||||
mkdir -p $out/share/icons/hicolor/''${size}x''${size}/apps
|
mkdir -p $out/share/icons/hicolor/''${size}x''${size}/apps
|
||||||
|
Loading…
x
Reference in New Issue
Block a user