jetbrains.jdk-bin: init at 1751.21#152723
Closed
lutzmor wants to merge 5 commits intoNixOS:masterfrom
Closed
Conversation
ofborg
bot
added
10.rebuild-darwin: 1-10
removed it because i thought it inherits from sourcebuild but brain lag ...
veprbl
reviewed
Jan 3, 2022
| @@ -0,0 +1,43 @@ | |||
| { lib, openjdk11, fetchurl, jetbrains, stdenv }: | |||
|
|
|||
| openjdk11.overrideAttrs (oldAttrs: rec { | |||
Member
There was a problem hiding this comment.
Why do an override of the (source build?) openjdk expression? Just use stdenvNoCC.mkDerivation.
| url = "https://cache-redirector.jetbrains.com/intellij-jbr/jbrsdk-${darwinVersion}.tar.gz"; | ||
| sha256 = if stdenv.isAarch64 then "65807ed92397cd92e1381c49039af443d713874e1ec8efd6e92e370514e56861" else "654dd3126e67de8605a7cd94a3ebc713365cc1d63ab6156dd65f0249b064e37a"; | ||
| }; | ||
| patches = []; |
Comment on lines
+19
to
+21
| postFixup = '' | ||
| ''; | ||
|
|
Member
There was a problem hiding this comment.
Suggested change
| postFixup = '' | |
| ''; |
| ''; | ||
| homepage = "https://confluence.jetbrains.com/display/JBR/JetBrains+Runtime"; | ||
| inherit (openjdk11.meta) license platforms mainProgram; | ||
| maintainers = with maintainers; [ edwtjo petabyteboy ]; |
Member
There was a problem hiding this comment.
Suggested change
| maintainers = with maintainers; [ edwtjo petabyteboy ]; | |
| maintainers = with maintainers; [ ]; |
But please be encouraged to add yourself.
| }) // { | ||
| jdk = callPackage ../development/compilers/jetbrains-jdk { }; | ||
| sourcebuild = callPackage ../development/compilers/jetbrains-jdk/default.nix { }; | ||
| prebuild = callPackage ../development/compilers/jetbrains-jdk/prebuild.nix { }; |
Member
There was a problem hiding this comment.
Our usual language for this is "build vs binary", so:
Suggested change
| prebuild = callPackage ../development/compilers/jetbrains-jdk/prebuild.nix { }; | |
| jdk-bin = callPackage ../development/compilers/jetbrains-jdk/bin.nix { }; |
veprbl
changed the title
Author
|
@veprbl thx for the inputs! Will change that when my new macbook is here ( the old one died yesterday ). |
Author
|
@veprbl i would close this PR ( i thought about the way i resolved the underlaying problem and don't like it ) will try to fix the underlaying problem why the jdk couldn't build on osx and will do a new pr. So its a proper fix to the problem without the need to switch to a binary package. |
Member
|
A source build would be preferred, indeed. |
Janik-Haag
added
the
12.first-time contribution
13 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Update jetbrains.sdk to be workable on darwin as well, the build process of the source variant used on linux is broken. So update to binary one for darwin.
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notesThis pr should fix the problem described here: #84263