Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

softmaker-office: fix unlocking again #100805

Merged
merged 2 commits into from Oct 18, 2020
Merged

softmaker-office: fix unlocking again #100805

merged 2 commits into from Oct 18, 2020

Conversation

danieldk
Copy link
Contributor

Motivation for this change

The PR should fix unlocking again. It turns out that the /bin/ls intercept is still needed. However, with the intercept enabled, startup was slow and resulted in many segfaults. It seems that the unlock code needs access to several programs. The second commit adds the relevant packages to PATH.

cc @romildo

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@danieldk
Revert "softmaker-office: remove /bin/ls intercept"
e3b407e 
This reverts commit e883c65.
@danieldk
softmaker-office: add additional programs to PATH
c342e5a 
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 NixOS#71228.
romildo
romildo approved these changes Oct 18, 2020
View reviewed changes
Copy link
Contributor

@romildo romildo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested freeoffice locally. Looks good to me.

@romildo romildo merged commit 2f74428 into NixOS:master Oct 18, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@romildo romildo romildo approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@danieldk @romildo