diff options
| author | Daniël de Kok <me@danieldk.eu> | 2020-09-21 19:56:29 +0200 |
|---|---|---|
| committer | Daniël de Kok <me@danieldk.eu> | 2020-09-21 19:56:29 +0200 |
| commit | e883c6578c5550fd577c53eaa7d27f7c464377cc (patch) | |
| tree | 80346a1846c5fd79bbf1ee7d59b4347d1fab7313 /pkgs/applications/office | |
| parent | 8403806a3953ac75ad1141e578e55293114a0617 (diff) | |
softmaker-office: remove /bin/ls intercept
This does not seem to be necessary anymore and fixes segmentation
faults on 20.03.
Diffstat (limited to 'pkgs/applications/office')
| -rw-r--r-- | pkgs/applications/office/softmaker/generic.nix | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/pkgs/applications/office/softmaker/generic.nix b/pkgs/applications/office/softmaker/generic.nix index c7803fa3d1d2..c1e25ecb00ec 100644 --- a/pkgs/applications/office/softmaker/generic.nix +++ b/pkgs/applications/office/softmaker/generic.nix @@ -5,7 +5,7 @@ # For fixing up execution of /bin/ls, which is necessary for # product unlocking. -, coreutils, libredirect +, coreutils , pname, version, edition, suiteName, src, archive @@ -52,22 +52,7 @@ in stdenv.mkDerivation { runHook postUnpack ''; - installPhase = let - # 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 '' + installPhase = '' runHook preInstall mkdir -p $out/share @@ -76,12 +61,9 @@ in stdenv.mkDerivation { # Wrap rather than symlinking, so that the programs can determine # their resource path. mkdir -p $out/bin - makeWrapper $out/share/${pname}${edition}/planmaker $out/bin/${pname}-planmaker \ - ${lsIntercept} - makeWrapper $out/share/${pname}${edition}/presentations $out/bin/${pname}-presentations \ - ${lsIntercept} - makeWrapper $out/share/${pname}${edition}/textmaker $out/bin/${pname}-textmaker \ - ${lsIntercept} + makeWrapper $out/share/${pname}${edition}/planmaker $out/bin/${pname}-planmaker + makeWrapper $out/share/${pname}${edition}/presentations $out/bin/${pname}-presentations + makeWrapper $out/share/${pname}${edition}/textmaker $out/bin/${pname}-textmaker for size in 16 32 48 64 96 128 256 512 1024; do mkdir -p $out/share/icons/hicolor/''${size}x''${size}/apps |