cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #98314 from gebner/upgradejava

Browse source
This commit is contained in:
Gabriel Ebner 2020-09-20 16:36:52 +02:00 committed by GitHub
commit a2bd21f1bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/applications/editors/jedit/default.nix
View file

@ -44,12 +44,8 @@ stdenv.mkDerivation {
mkdir -p $out/share/applications mkdir -p $out/share/applications
mv package-files/linux/deb/jedit.desktop $out/share/applications/jedit.desktop mv package-files/linux/deb/jedit.desktop $out/share/applications/jedit.desktop
patch package-files/linux/jedit << EOF # specify the correct JAVA_HOME
5a6,8 sed -i '1a JAVA_HOME=${jdk}' package-files/linux/jedit
> # specify the correct JAVA_HOME
> JAVA_HOME=${jdk.jre.home}/jre
>
EOF
sed -i "s|/usr/share/jEdit/@jar.filename@|$out/share/jEdit/jedit.jar|g" package-files/linux/jedit sed -i "s|/usr/share/jEdit/@jar.filename@|$out/share/jEdit/jedit.jar|g" package-files/linux/jedit
mkdir -p $out/bin mkdir -p $out/bin
cp package-files/linux/jedit $out/bin/jedit cp package-files/linux/jedit $out/bin/jedit

6
pkgs/applications/misc/gpsprune/default.nix
View file

@ -1,4 +1,4 @@
{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jdk11 }: { fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jdk }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gpsprune"; pname = "gpsprune";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jdk11 ]; buildInputs = [ jdk ];
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
name = "gpsprune"; name = "gpsprune";
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
buildCommand = '' buildCommand = ''
mkdir -p $out/bin $out/share/java mkdir -p $out/bin $out/share/java
cp -v $src $out/share/java/gpsprune.jar cp -v $src $out/share/java/gpsprune.jar
makeWrapper ${jdk11}/bin/java $out/bin/gpsprune \ makeWrapper ${jdk}/bin/java $out/bin/gpsprune \
--add-flags "-jar $out/share/java/gpsprune.jar" --add-flags "-jar $out/share/java/gpsprune.jar"
mkdir -p $out/share/applications mkdir -p $out/share/applications
cp $desktopItem/share/applications"/"* $out/share/applications cp $desktopItem/share/applications"/"* $out/share/applications

4
pkgs/development/interpreters/clojure/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, installShellFiles, jdk11, rlwrap, makeWrapper }: { stdenv, fetchurl, installShellFiles, jdk, rlwrap, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "clojure"; pname = "clojure";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
installPhase = installPhase =
let let
binPath = stdenv.lib.makeBinPath [ rlwrap jdk11 ]; binPath = stdenv.lib.makeBinPath [ rlwrap jdk ];
in in
'' ''
mkdir -p $out/libexec mkdir -p $out/libexec

32
pkgs/top-level/all-packages.nix
View file

@ -743,9 +743,7 @@ in
arduino-cli = callPackage ../development/arduino/arduino-cli { }; arduino-cli = callPackage ../development/arduino/arduino-cli { };
arduino-core = callPackage ../development/arduino/arduino-core { arduino-core = callPackage ../development/arduino/arduino-core { };
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
arduino-mk = callPackage ../development/arduino/arduino-mk {}; arduino-mk = callPackage ../development/arduino/arduino-mk {};
@ -1251,9 +1249,7 @@ in
aws_mturk_clt = callPackage ../tools/misc/aws-mturk-clt { }; aws_mturk_clt = callPackage ../tools/misc/aws-mturk-clt { };
awstats = callPackage ../tools/system/awstats { awstats = callPackage ../tools/system/awstats { };
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
awsweeper = callPackage ../tools/admin/awsweeper { }; awsweeper = callPackage ../tools/admin/awsweeper { };
@ -3049,9 +3045,7 @@ in
davfs2 = callPackage ../tools/filesystems/davfs2 { }; davfs2 = callPackage ../tools/filesystems/davfs2 { };
dbeaver = callPackage ../applications/misc/dbeaver { dbeaver = callPackage ../applications/misc/dbeaver { };
jdk = jdk11;
};
dbench = callPackage ../development/tools/misc/dbench { }; dbench = callPackage ../development/tools/misc/dbench { };
@ -3431,9 +3425,7 @@ in
choose = callPackage ../tools/text/choose { }; choose = callPackage ../tools/text/choose { };
emscripten = callPackage ../development/compilers/emscripten { emscripten = callPackage ../development/compilers/emscripten { };
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
emscriptenPackages = recurseIntoAttrs (callPackage ./emscripten-packages.nix { }); emscriptenPackages = recurseIntoAttrs (callPackage ./emscripten-packages.nix { });
@ -6783,9 +6775,7 @@ in
rubocop = callPackage ../development/tools/rubocop { }; rubocop = callPackage ../development/tools/rubocop { };
runelite = callPackage ../games/runelite { runelite = callPackage ../games/runelite { };
jre = openjdk11;
};
runningx = callPackage ../tools/X11/runningx { }; runningx = callPackage ../tools/X11/runningx { };
@ -8579,9 +8569,7 @@ in
clean = callPackage ../development/compilers/clean { }; clean = callPackage ../development/compilers/clean { };
closurecompiler = callPackage ../development/compilers/closure { closurecompiler = callPackage ../development/compilers/closure { };
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
cmdstan = callPackage ../development/compilers/cmdstan { }; cmdstan = callPackage ../development/compilers/cmdstan { };
@ -21446,9 +21434,7 @@ in
jdupes = callPackage ../tools/misc/jdupes { }; jdupes = callPackage ../tools/misc/jdupes { };
jedit = callPackage ../applications/editors/jedit { jedit = callPackage ../applications/editors/jedit { };
jdk = jdk8; # TODO: upgrade
};
jgmenu = callPackage ../applications/misc/jgmenu { }; jgmenu = callPackage ../applications/misc/jgmenu { };
@ -21458,7 +21444,7 @@ in
joe = callPackage ../applications/editors/joe { }; joe = callPackage ../applications/editors/joe { };
josm = callPackage ../applications/misc/josm { jre = jdk11; }; josm = callPackage ../applications/misc/josm { };
jwm = callPackage ../applications/window-managers/jwm { }; jwm = callPackage ../applications/window-managers/jwm { };
@ -21915,7 +21901,7 @@ in
mediainfo-gui = callPackage ../applications/misc/mediainfo-gui { }; mediainfo-gui = callPackage ../applications/misc/mediainfo-gui { };
mediathekview = callPackage ../applications/video/mediathekview { jre = openjdk11; }; mediathekview = callPackage ../applications/video/mediathekview { };
meteo = callPackage ../applications/networking/weather/meteo { }; meteo = callPackage ../applications/networking/weather/meteo { };