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

Merge pull request #98413 from danieldk/softmaker-remove-intercept

Browse Source 
softmaker-office: remove /bin/ls intercept
This commit is contained in:
Daniël de Kok 2020-09-22 17:53:05 +02:00 committed by GitHub
commit 260f03f9e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/applications/office/softmaker/generic.nix
View File

@ -5,7 +5,7 @@
# For fixing up execution of /bin/ls, which is necessary for # For fixing up execution of /bin/ls, which is necessary for
# product unlocking. # product unlocking.
, coreutils, libredirect , coreutils
, pname, version, edition, suiteName, src, archive , pname, version, edition, suiteName, src, archive
@ -52,22 +52,7 @@ in stdenv.mkDerivation {
runHook postUnpack runHook postUnpack
''; '';
installPhase = let installPhase = ''
# SoftMaker/FreeOffice collects some system information upon
# unlocking the product. But in doing so, it attempts to execute
# /bin/ls. If the execve syscall fails, the whole unlock
# procedure fails. This works around that by rewriting /bin/ls
# to the proper path.
#
# SoftMaker Office restarts itself upon some operations, such
# changing the theme and unlocking. Unfortunately, we do not
# have control over its environment then and it will fail
# with an error.
lsIntercept = ''
--set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
--set NIX_REDIRECTS "/bin/ls=${coreutils}/bin/ls"
'';
in ''
runHook preInstall runHook preInstall
mkdir -p $out/share mkdir -p $out/share
@ -76,12 +61,9 @@ in stdenv.mkDerivation {
# Wrap rather than symlinking, so that the programs can determine # Wrap rather than symlinking, so that the programs can determine
# 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} makeWrapper $out/share/${pname}${edition}/presentations $out/bin/${pname}-presentations
makeWrapper $out/share/${pname}${edition}/presentations $out/bin/${pname}-presentations \ makeWrapper $out/share/${pname}${edition}/textmaker $out/bin/${pname}-textmaker
${lsIntercept}
makeWrapper $out/share/${pname}${edition}/textmaker $out/bin/${pname}-textmaker \
${lsIntercept}
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