mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-08 05:27:57 +03:00
Merge pull request #203958 from thiagokokada/openjdk-disable-openjfk-by-default
This commit is contained in:
commit
4b092d03a7
@ -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 ];
|
||||
|
@ -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 ];
|
||||
|
@ -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
|
||||
}:
|
||||
|
||||
|
@ -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
|
||||
}:
|
||||
|
||||
|
@ -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
|
||||
}:
|
||||
|
||||
|
@ -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
|
||||
}:
|
||||
|
||||
|
@ -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 { };
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user