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

wrap-qt-apps-hook.sh: wrap binaries in ./sbin/ #74990

Merged
merged 1 commit into from Dec 8, 2019
Merged

wrap-qt-apps-hook.sh: wrap binaries in ./sbin/ #74990

merged 1 commit into from Dec 8, 2019

Conversation

bjornfor
Copy link
Contributor

@bjornfor bjornfor commented Dec 4, 2019

Motivation for this change

wrap-qt-apps-hook.sh runs before move-sbin.sh, so programs in ./sbin are
currently not wrapped. Fix it.

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 nix-review --run "nix-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.
Notify maintainers

cc @

@bjornfor
wrap-qt-apps-hook.sh: wrap binaries in ./sbin/
38fe21d 
wrap-qt-apps-hook.sh runs before move-sbin.sh, so programs in ./sbin are
currently not wrapped. Fix it.
@flokli
Copy link
Contributor

flokli commented Dec 4, 2019

Can we change the order of how it's run?

@FRidh
Copy link
Member

FRidh commented Dec 4, 2019

How I wish we had no explicit order for phases and hooks and instead used something like multiple dispatch to determine the ordering.

@worldofpeace
Copy link
Contributor

We have the same issue with wrapGAppsHook because of ordering. I've just taken to having people not install things in sbin.

I think there won't be a problem with things becoming double wrapped hopefully (because checking for elf interpreter).

@bjornfor bjornfor changed the base branch from master to staging December 8, 2019 19:33
@bjornfor bjornfor merged commit 9e144d5 into NixOS:staging Dec 8, 2019
@bjornfor bjornfor deleted the wrap-qt-apps-hook-in-sbin branch December 8, 2019 19:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ttuegel ttuegel ttuegel approved these changes

@worldofpeace worldofpeace worldofpeace approved these changes

Assignees
No one assigned
Labels
6.topic: qt/kde 10.rebuild-darwin: 101-500 10.rebuild-linux: 501+ 10.rebuild-linux: 1001-2500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@bjornfor @flokli @FRidh @worldofpeace @ttuegel