public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

icedtea_web: use glib rather than gtk2 in buildInputs

Browse Source 
The dependency on GTK was removed in
c7aae0e400

Also, remove that pesky commented-out line from `preConfigure` too!
This commit is contained in:
Stefano Mazzucco 2019-08-13 22:42:32 +01:00
parent ebde1ddd0e
commit 2d4bdb8733
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/compilers/icedtea-web/default.nix
View File

@ -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 { stdenv.mkDerivation rec {
name = "icedtea-web-${version}"; name = "icedtea-web-${version}";
@ -13,10 +13,9 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ autoreconfHook pkgconfig bc ]; nativeBuildInputs = [ autoreconfHook pkgconfig bc ];
buildInputs = [ cargo rustc gtk2 xulrunner zip npapi_sdk ]; buildInputs = [ cargo rustc glib xulrunner zip npapi_sdk ];
preConfigure = '' preConfigure = ''
#patchShebangs javac.in
configureFlagsArray+=("BIN_BASH=${bash}/bin/bash") configureFlagsArray+=("BIN_BASH=${bash}/bin/bash")
''; '';