ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-08 05:27:57 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #203958 from thiagokokada/openjdk-disable-openjfk-by-default

Browse Source
This commit is contained in:
Sandro 2022-12-02 00:10:47 +01:00 committed by GitHub
commit 4b092d03a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/misc/conduktor/default.nix
View File

@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
src = fetchzip {
url = "https://github.com/conduktor/builds/releases/download/v${version}/Conduktor-linux-${version}.zip";
sha256 = "1kr5yh9piqbl6njsnxgh6jzf3vifw8ja5x4qm4znmzi3r49sw0gx";
sha256 = "sha256-9y/7jni5zIITUWd75AxsfG/b5vCYotmeMeC9aYM2WEs=";
};
nativeBuildInputs = [ makeWrapper copyDesktopItems ];

1
pkgs/applications/networking/charles/default.nix
View File

@ -34,6 +34,7 @@ let
src = fetchurl {
url = "https://www.charlesproxy.com/assets/release/${version}/charles-proxy-${version}${platform}.tar.gz";
curlOptsList = [ "--user-agent" "Mozilla/5.0" ]; # HTTP 104 otherwise
inherit sha256;
};
nativeBuildInputs = [ makeWrapper ];

3
pkgs/development/compilers/openjdk/11.nix
View File

@ -4,7 +4,8 @@
, libXcursor, libXrandr, fontconfig, openjdk11-bootstrap
, setJavaClassPath
, headless ? false
, enableJavaFX ? openjfx.meta.available, openjfx
# disabled by default since openjfx11 depends on python2 (EOL)
, enableJavaFX ? false, openjfx
, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
}:

3
pkgs/development/compilers/openjdk/12.nix
View File

@ -4,7 +4,8 @@
, libXcursor, libXrandr, fontconfig, openjdk11, fetchpatch
, setJavaClassPath
, headless ? false
, enableJavaFX ? openjfx.meta.available, openjfx
# disabled by default since openjfx11 depends on python2 (EOL)
, enableJavaFX ? false, openjfx
, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
}:

3
pkgs/development/compilers/openjdk/13.nix
View File

@ -4,7 +4,8 @@
, libXcursor, libXrandr, fontconfig, openjdk13-bootstrap, fetchpatch
, setJavaClassPath
, headless ? false
, enableJavaFX ? openjfx.meta.available, openjfx
# disabled by default since openjfx11 depends on python2 (EOL)
, enableJavaFX ? false, openjfx
, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
}:

3
pkgs/development/compilers/openjdk/14.nix
View File

@ -4,7 +4,8 @@
, libXcursor, libXrandr, fontconfig, openjdk14-bootstrap
, setJavaClassPath
, headless ? false
, enableJavaFX ? openjfx.meta.available, openjfx
# disabled by default since openjfx11 depends on python2 (EOL)
, enableJavaFX ? false, openjfx
, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
}:

4
pkgs/top-level/all-packages.nix
View File

@ -2783,7 +2783,9 @@ with pkgs;
bcachefs-tools = callPackage ../tools/filesystems/bcachefs-tools { };
bisq-desktop = callPackage ../applications/blockchains/bisq-desktop { };
bisq-desktop = callPackage ../applications/blockchains/bisq-desktop {
openjdk11 = openjdk11.override { enableJavaFX = true; };
};
bic = callPackage ../development/interpreters/bic { };