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

treewide: explicitly specify gtk and related package versions

Browse Source
This commit is contained in:
Kirill Boltaev
2016-09-12 00:24:51 +03:00
parent 30107249b1
commit bccd75094f
339 changed files with 893 additions and 872 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/java/classpath/default.nix
View File

@@ -1,4 +1,4 @@
{ fetchurl, stdenv, javac, jvm, antlr, pkgconfig, gtk, gconf, ecj }:
{ fetchurl, stdenv, javac, jvm, antlr, pkgconfig, gtk2, gconf, ecj }:
stdenv.mkDerivation rec {
name = "classpath-0.99";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
patches = [ ./missing-casts.patch ];
buildInputs = [ javac jvm antlr pkgconfig gtk gconf ecj ];
buildInputs = [ javac jvm antlr pkgconfig gtk2 gconf ecj ];
configurePhase = ''
# GCJ tries to compile all of Classpath during the `configure' run when

4
pkgs/development/libraries/java/swt/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, unzip, jdk, pkgconfig, gtk
{ stdenv, lib, fetchurl, unzip, jdk, pkgconfig, gtk2
, libXt, libXtst, libXi, mesa, webkit, libsoup, xorg
, pango, gdk_pixbuf, glib
}:
@@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
sourceRoot = ".";
nativeBuildInputs = [ unzip pkgconfig ];
buildInputs = [ jdk gtk libXt libXtst libXi mesa webkit libsoup ];
buildInputs = [ jdk gtk2 libXt libXtst libXi mesa webkit libsoup ];
NIX_LFLAGS = (map (x: "-L${lib.getLib x}/lib") [ xorg.libX11 pango gdk_pixbuf glib ]) ++
[ "-lX11" "-lpango-1.0" "-lgdk_pixbuf-2.0" "-lglib-2.0" ];