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

Merge pull request #71460 from danieldk/softmaker-office-fix-unlock

Browse Source 
softmaker-office: fix product unlock error
This commit is contained in:
José Romildo Malaquias 2019-10-21 20:33:27 -03:00 committed by GitHub
commit c0dd1e5400
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,6 +3,10 @@
# Dynamic Libraries
, curl, libGL, libX11, libXext, libXmu, libXrandr, libXrender
# For fixing up execution of /bin/ls, which is necessary for
# product unlocking.
, coreutils, libredirect
, pname, version, edition, suiteName, src, archive
, ...
@ -45,7 +49,22 @@ in stdenv.mkDerivation rec {
runHook postUnpack
'';
installPhase = ''
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 ''
runHook preInstall
mkdir -p $out/share
@ -54,9 +73,12 @@ in stdenv.mkDerivation rec {
# 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
makeWrapper $out/share/${pname}${edition}/presentations $out/bin/${pname}-presentations
makeWrapper $out/share/${pname}${edition}/textmaker $out/bin/${pname}-textmaker
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}
for size in 16 32 48 64 96 128 256 512 1024; do
mkdir -p $out/share/icons/hicolor/''${size}x''${size}/apps