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

sqldeveloper: simplify, add darwin support #45110

Merged
merged 1 commit into from Aug 16, 2018
Merged

Conversation

flokli
Copy link
Contributor

@flokli flokli commented Aug 16, 2018

Motivation for this change

Use unpackCmd and installPhase instead of overwriting buildCommand.
This makes the derivation more readable, and adds binary stripping and
shebang patching of the output as a bonus :-)

Use makeWrapper instead of a custom wrapper script, and only export
environment variables that are used.

Set JAVA_HOME to ${jdk.home}, making it more generic and independent of
the specific jdk path being used (was a different one on zulu). This
fixes sqldeveloper on darwin, so add it to supported platforms
(plus the known-working x86_64-linux)

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.

Use unpackCmd and installPhase instead of overwriting buildCommand.
This makes the derivation more readable, and adds binary stripping and
shebang patching of the output as a bonus :-)

Use makeWrapper instead of a custom wrapper script, and only export
environment variables that are used.

Set JAVA_HOME to ${jdk.home}, making it more generic and independent of
the specific jdk path being used (was a different one on zulu). This
fixes sqldeveloper on darwin, so add it to supported platforms
(plus the known-working x86_64-linux)
@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

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

Partial log (click to expand)


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

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


@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: sqldeveloper

Partial log (click to expand)


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

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


@GrahamcOfBorg
Copy link

No attempt on x86_64-linux (full log)

The following builds were skipped because they don't evaluate on x86_64-linux: sqldeveloper

Partial log (click to expand)


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

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


@Mic92
Copy link
Member

Mic92 commented Aug 16, 2018

Have you tested it on macOS as well?

@flokli
Copy link
Contributor Author

flokli commented Aug 16, 2018

yes, builds and runs on MacOS (Sierra).

@Mic92 Mic92 merged commit 1fd75a1 into NixOS:master Aug 16, 2018
@Ma27
Copy link
Member

Ma27 commented Aug 16, 2018

@Mic92 @flokli would you mind having a look at #44624?
In case you agree with the change I'd rebase it onto your patch%)

@flokli flokli deleted the sqldeveloper branch August 16, 2018 16:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants