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

Zotero: Fix to use patchelf instead of FHS Env. #56809

Merged
merged 2 commits into from Apr 10, 2019
Merged

Zotero: Fix to use patchelf instead of FHS Env. #56809

merged 2 commits into from Apr 10, 2019

Conversation

jpathy
Copy link
Contributor

@jpathy jpathy commented Mar 4, 2019

Don't use buildFHSUserEnv and use patchelf to fix up the binary and libs. This should fix issue #48814.

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@jpathy
Zotero: Fix to use patchelf instead of FHS Env.
142260c 
Removed buildFHSUserEnv to use `patchelf` on prebuilt binaries and libs. Should fix issue #48814.
@timor
Copy link
Member

timor commented Mar 13, 2019

Thanks for this great patch!

I tested this:

  • 19.03: builds
  • 18.09: builds and runs (from command line)

I encountered one issue, though: The desktop item which is copied from the upstream source does not work. It does not start (the exec entry is trying to be clever), and the icon is also missing (which could be a kde issue on my setup, though)

@jpathy
Copy link
Contributor Author

jpathy commented Mar 14, 2019

I don't use a DE, so i didn't know the desktop file was broken. It should be fixed now. Let me know if it works for you. Thanks.

@timor
Copy link
Member

timor commented Mar 14, 2019

It works now.

tomberek
tomberek approved these changes Apr 10, 2019
View reviewed changes
Copy link
Contributor

@tomberek tomberek left a comment

Choose a reason for hiding this comment

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

Builds, runs, no reverse dependencies. Another user confirms proper behavior. This is a step away from FHS and towards native nix packaging.

@nixos-discourse
Copy link

This pull request has been mentioned on Nix community. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/12

@timokau timokau merged commit bd50fc9 into NixOS:master Apr 10, 2019
@jpathy jpathy deleted the patch-2 branch April 11, 2019 16:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tomberek tomberek tomberek approved these changes

Assignees
No one assigned
Labels
8.has: package (new) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@jpathy @timor @nixos-discourse @tomberek @timokau @GrahamcOfBorg