From 2d4bdb87336ee7e36f9c4fa3574da0951ecadb67 Mon Sep 17 00:00:00 2001 From: Stefano Mazzucco Date: Tue, 13 Aug 2019 22:42:32 +0100 Subject: [PATCH] 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! --- pkgs/development/compilers/icedtea-web/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/icedtea-web/default.nix b/pkgs/development/compilers/icedtea-web/default.nix index 38c93f1e4a0..73dd90ab4a1 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") '';