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

franz, rambox: cleanup #25020

Merged
merged 1 commit into from Apr 23, 2017
Merged

franz, rambox: cleanup #25020

merged 1 commit into from Apr 23, 2017

Conversation

ghost
Copy link

@ghost ghost commented Apr 19, 2017

Motivation for this change

Clean franz & rambox expressions for easier maintaining

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • 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/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

@gnidorah, thanks for your PR! By analyzing the history of the files in this pull request, we identified @NeQuissimus, @zimbatm and @zraexy to be potential reviewers.

Copy link
Member

@zimbatm zimbatm left a comment

Choose a reason for hiding this comment

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

LGTM

@@ -42,19 +45,20 @@ in stdenv.mkDerivation rec {

installPhase = ''
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" Franz
patchelf --set-rpath "$out/share/franz:${stdenv.lib.makeLibraryPath deps}" Franz
patchelf --set-rpath "$out/opt/franz:${stdenv.lib.makeLibraryPath deps}" Franz
Copy link
Member

Choose a reason for hiding this comment

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

why is "opt" more appropriate than "share"?

Copy link
Author

Choose a reason for hiding this comment

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

@zimbatm That's where e.g. Arch and Debian packages install them

@zimbatm zimbatm merged commit 749d495 into NixOS:master Apr 23, 2017
@ghost ghost deleted the master2 branch April 24, 2017 06:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants