diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-01-03 00:25:17 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-01-03 11:56:40 +0100 |
| commit | 79675fad6ed991f6184f5c29960ca993e3439907 (patch) | |
| tree | 51a8e95736f775d54797a362404f03c74d6b6dee /pkgs/top-level | |
| parent | 7f11ef63458b88d8e41395db40fda3989545b0cf (diff) | |
| download | nixlib-79675fad6ed991f6184f5c29960ca993e3439907.tar nixlib-79675fad6ed991f6184f5c29960ca993e3439907.tar.gz nixlib-79675fad6ed991f6184f5c29960ca993e3439907.tar.bz2 nixlib-79675fad6ed991f6184f5c29960ca993e3439907.tar.lz nixlib-79675fad6ed991f6184f5c29960ca993e3439907.tar.xz nixlib-79675fad6ed991f6184f5c29960ca993e3439907.tar.zst nixlib-79675fad6ed991f6184f5c29960ca993e3439907.zip | |
openjdk: Use multiple outputs
This unifies the "openjdk" and "openjre" packages. The JDK is placed in the "out" output, the JRE in "jre". Also, everything is now stored in $prefix/lib/openjdk, so the JDK/JRE no longer pollute user environments with files like "ASSEMBLY_EXCEPTION" at top-level.
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90f98cab65dd..a3683fecc109 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2833,9 +2833,7 @@ let ant = pkgs.ant.override { jdk = openjdkBootstrap; }; }; - openjre = pkgs.openjdk.override { - jreOnly = true; - }; + openjre = pkgs.openjdk.jre; jdk = if stdenv.isDarwin || stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then pkgs.openjdk |