diff options
| author | Stefano Mazzucco <stefano@curso.re> | 2019-08-13 22:42:32 +0100 |
|---|---|---|
| committer | Stefano Mazzucco <stefano@curso.re> | 2019-08-13 22:45:25 +0100 |
| commit | 2d4bdb87336ee7e36f9c4fa3574da0951ecadb67 (patch) | |
| tree | 32faf87bbed0b4f7746b8ca74c16610f121ff0f2 | |
| parent | ebde1ddd0e2a81ef860913ad93d8c0e3dc94399a (diff) | |
icedtea_web: use glib rather than gtk2 in buildInputs
The dependency on GTK was removed in
https://github.com/AdoptOpenJDK/IcedTea-Web/commit/c7aae0e400daf2939338963159038c9d07b5037b
Also, remove that pesky commented-out line from `preConfigure` too!
| -rw-r--r-- | pkgs/development/compilers/icedtea-web/default.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/development/compilers/icedtea-web/default.nix b/pkgs/development/compilers/icedtea-web/default.nix index 38c93f1e4a06..73dd90ab4a1f 100644 --- a/pkgs/development/compilers/icedtea-web/default.nix +++ b/pkgs/development/compilers/icedtea-web/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cargo, rustc, autoreconfHook, jdk, gtk2, xulrunner, zip, pkgconfig, npapi_sdk, bash, bc }: +{ stdenv, fetchFromGitHub, cargo, rustc, autoreconfHook, jdk, glib, xulrunner, zip, pkgconfig, npapi_sdk, bash, bc }: stdenv.mkDerivation rec { name = "icedtea-web-${version}"; @@ -13,10 +13,9 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkgconfig bc ]; - buildInputs = [ cargo rustc gtk2 xulrunner zip npapi_sdk ]; + buildInputs = [ cargo rustc glib xulrunner zip npapi_sdk ]; preConfigure = '' - #patchShebangs javac.in configureFlagsArray+=("BIN_BASH=${bash}/bin/bash") ''; |