Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8766210d9d45
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8023e3c42a8a
Choose a head ref
  • 2 commits
  • 5 files changed
  • 1 contributor

Commits on Nov 26, 2020

  1. openjdk: Merge passthrus 

    Fixes #104680.
    @doronbehar @veprbl
    doronbehar authored and veprbl committed Nov 26, 2020
    Copy the full SHA
    3e48a6d View commit details

  2. openjdk*: Add gtk3 to passthru of all versions

    @doronbehar @veprbl
    doronbehar authored and veprbl committed Nov 26, 2020
    Copy the full SHA
    8023e3c View commit details
1 change: 1 addition & 0 deletions pkgs/development/compilers/openjdk/11.nix
View file
Original file line number Diff line number Diff line change
@@ -147,6 +147,7 @@ let
passthru = {
architecture = "";
home = "${openjdk}/lib/openjdk";
inherit gtk3;
};
};
in openjdk
1 change: 1 addition & 0 deletions pkgs/development/compilers/openjdk/12.nix
View file
Original file line number Diff line number Diff line change
@@ -151,6 +151,7 @@ let
passthru = {
architecture = "";
home = "${openjdk}/lib/openjdk";
inherit gtk3;
};
};
in openjdk
1 change: 1 addition & 0 deletions pkgs/development/compilers/openjdk/13.nix
View file
Original file line number Diff line number Diff line change
@@ -151,6 +151,7 @@ let
passthru = {
architecture = "";
home = "${openjdk}/lib/openjdk";
inherit gtk3;
};
};
in openjdk
1 change: 1 addition & 0 deletions pkgs/development/compilers/openjdk/8.nix
View file
Original file line number Diff line number Diff line change
@@ -267,6 +267,7 @@ let
passthru = {
inherit architecture;
home = "${openjdk8}/lib/openjdk";
inherit gtk2;
};
};
in openjdk8
5 changes: 1 addition & 4 deletions pkgs/development/compilers/openjdk/default.nix
View file
Original file line number Diff line number Diff line change
@@ -31,10 +31,6 @@ let
gtk3 gnome_vfs GConf glib
];

passthru = {
inherit gtk3;
};

patches = [
./fix-java-home-jdk10.patch
./read-truststore-from-env-jdk10.patch
@@ -155,6 +151,7 @@ let
passthru = {
architecture = "";
home = "${openjdk}/lib/openjdk";
inherit gtk3;
};
};
in openjdk