Unverified Commit 4b092d03 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

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

parents f2f2a140 7d7e8155

pkgs/applications/misc/conduktor/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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 ];

pkgs/applications/networking/charles/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -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 ];

pkgs/development/compilers/openjdk/11.nix

+2 −1
Original line number Diff line number Diff line
@@ -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

}:

pkgs/development/compilers/openjdk/12.nix

+2 −1
Original line number Diff line number Diff line
@@ -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

}:

pkgs/development/compilers/openjdk/13.nix

+2 −1
Original line number Diff line number Diff line
@@ -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

}: