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.

Sign up for GitHub

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

jameica: get rid of launcher script, only use makeWrapper #45270

Merged
merged 1 commit into from Aug 17, 2018
Merged

jameica: get rid of launcher script, only use makeWrapper #45270

merged 1 commit into from Aug 17, 2018

Conversation

flokli
Copy link
Contributor

@flokli flokli commented Aug 17, 2018

This also switches using java paths suggested by docs instead of
$out/share/libexec

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)
  • Fits CONTRIBUTING.md.

@flokli
jameica: get rid of launcher script, only use makeWrapper
30f0011 
This also switches using java paths suggested by docs instead of
$out/share/libexec
@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: jameica

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@andir andir merged commit 5162ee0 into NixOS:master Aug 17, 2018
@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: jameica

Partial log (click to expand)

sub_jar_sign:

BUILD SUCCESSFUL
Total time: 5 seconds
installing
post-installation fixup
strip is /nix/store/251fvx4mx9q4zarbca5cciasmn66p668-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/9xbyi01gss0mkh7gykbs3qrizxxjgm2j-jameica-2.8.1-449/lib  /nix/store/9xbyi01gss0mkh7gykbs3qrizxxjgm2j-jameica-2.8.1-449/libexec  /nix/store/9xbyi01gss0mkh7gykbs3qrizxxjgm2j-jameica-2.8.1-449/bin
patching script interpreter paths in /nix/store/9xbyi01gss0mkh7gykbs3qrizxxjgm2j-jameica-2.8.1-449
/nix/store/9xbyi01gss0mkh7gykbs3qrizxxjgm2j-jameica-2.8.1-449

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: jameica

Partial log (click to expand)

glibPreInstallPhase
installing
glibPreFixupPhase
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/3wjcacrlwdn5iliw5vwrrkxw51cm4lay-jameica-2.8.1-449
strip is /nix/store/gpc2wld1s0c6qzx9326cwn1wcx29xzsj-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/3wjcacrlwdn5iliw5vwrrkxw51cm4lay-jameica-2.8.1-449/lib  /nix/store/3wjcacrlwdn5iliw5vwrrkxw51cm4lay-jameica-2.8.1-449/libexec  /nix/store/3wjcacrlwdn5iliw5vwrrkxw51cm4lay-jameica-2.8.1-449/bin
patching script interpreter paths in /nix/store/3wjcacrlwdn5iliw5vwrrkxw51cm4lay-jameica-2.8.1-449
checking for references to /build in /nix/store/3wjcacrlwdn5iliw5vwrrkxw51cm4lay-jameica-2.8.1-449...
/nix/store/3wjcacrlwdn5iliw5vwrrkxw51cm4lay-jameica-2.8.1-449

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andir andir andir approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@flokli @GrahamcOfBorg @andir