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: 3cc957834bb4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8499ee60bbac
Choose a head ref
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on Nov 9, 2019

  1. openjdk{8,11,12}: fix eval

    @Ma27
    Ma27 committed Nov 9, 2019
    Copy the full SHA
    8499ee6 View commit details
Showing with 6 additions and 6 deletions.
  1. +2 −2 pkgs/development/compilers/openjdk/11.nix
  2. +2 −2 pkgs/development/compilers/openjdk/8.nix
  3. +2 −2 pkgs/development/compilers/openjdk/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/compilers/openjdk/11.nix
View file
Original file line number Diff line number Diff line change
@@ -61,9 +61,9 @@ let

separateDebugInfo = true;

NIX_CFLAGS_COMPILE = "-Wno-error";
env.NIX_CFLAGS_COMPILE = "-Wno-error";

NIX_LDFLAGS = toString (lib.optionals (!headless) [
env.NIX_LDFLAGS = toString (lib.optionals (!headless) [
"-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
] ++ lib.optionals (!headless && enableGnome2) [
"-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
4 changes: 2 additions & 2 deletions pkgs/development/compilers/openjdk/8.nix
View file
Original file line number Diff line number Diff line change
@@ -140,7 +140,7 @@ let

separateDebugInfo = true;

NIX_CFLAGS_COMPILE = toString ([
env.NIX_CFLAGS_COMPILE = toString ([
# glibc 2.24 deprecated readdir_r so we need this
# See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html
"-Wno-error=deprecated-declarations"
@@ -153,7 +153,7 @@ let
"-Wno-error"
]);

NIX_LDFLAGS= toString (lib.optionals (!headless) [
env.NIX_LDFLAGS= toString (lib.optionals (!headless) [
"-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
] ++ lib.optionals (!headless && enableGnome2) [
"-lgtk-x11-2.0" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
4 changes: 2 additions & 2 deletions pkgs/development/compilers/openjdk/default.nix
View file
Original file line number Diff line number Diff line change
@@ -69,9 +69,9 @@ let

separateDebugInfo = true;

NIX_CFLAGS_COMPILE = "-Wno-error";
env.NIX_CFLAGS_COMPILE = "-Wno-error";

NIX_LDFLAGS = toString (lib.optionals (!headless) [
env.NIX_LDFLAGS = toString (lib.optionals (!headless) [
"-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
] ++ lib.optionals (!headless && enableGnome2) [
"-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"