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 18:26:06 +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
pkgs/development/ocaml-modules/lablgtk/2.14.0.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk, libgnomecanvas, libglade, gtksourceview, camlp4 }:
{ stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview, camlp4 }:
let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
@@ -14,7 +14,7 @@ stdenv.mkDerivation (rec {
sha256 = "1fnh0amm7lwgyjdhmlqgsp62gwlar1140425yc1j6inwmgnsp0a9";
};
buildInputs = [ ocaml findlib pkgconfig gtk libgnomecanvas libglade gtksourceview camlp4 ];
buildInputs = [ ocaml findlib pkgconfig gtk2 libgnomecanvas libglade gtksourceview camlp4 ];
configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml_version}/site-lib";
buildFlags = "world";
pkgs/development/ocaml-modules/lablgtk/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk, libgnomecanvas, libglade, gtksourceview, camlp4}:
{stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview, camlp4}:
let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
sha256 = "1bybn3jafxf4cx25zvn8h2xj9agn1xjbn7j3ywxxqx6az7rfnnwp";
};
buildInputs = [ocaml findlib pkgconfig gtk libgnomecanvas libglade gtksourceview camlp4];
buildInputs = [ocaml findlib pkgconfig gtk2 libgnomecanvas libglade gtksourceview camlp4];
configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml_version}/site-lib";
buildFlags = "world";
pkgs/development/ocaml-modules/ocaml-cairo/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, automake, ocaml, autoconf, gnum4, pkgconfig, freetype, lablgtk, unzip, cairo, findlib, gdk_pixbuf, glib, gtk, pango }:
{stdenv, fetchurl, automake, ocaml, autoconf, gnum4, pkgconfig, freetype, lablgtk, unzip, cairo, findlib, gdk_pixbuf, glib, gtk2, pango }:
let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
patches = [ ./META.patch ];
buildInputs = [ ocaml automake gnum4 autoconf unzip pkgconfig
findlib freetype lablgtk cairo gdk_pixbuf gtk pango ];
findlib freetype lablgtk cairo gdk_pixbuf gtk2 pango ];
createFindlibDestdir = true;
pkgs/development/ocaml-modules/ocaml-cairo2/default.nix
+3 -3
View File
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, ocaml, findlib, pkgconfig, cairo, lablgtk, gtk,
{ stdenv, fetchurl, ocaml, findlib, pkgconfig, cairo, lablgtk, gtk2,
enableGtkSupport ? true # Whether to compile with support for Gtk
# integration (library file cairo2_gtk). Depends
# on lablgtk and gtk.
# on lablgtk and gtk2.
}:
let
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
};
buildInputs = [ ocaml findlib pkgconfig cairo ]
++ optionals enableGtkSupport [ gtk ];
++ optionals enableGtkSupport [ gtk2 ];
# lablgtk2 is marked as a propagated build input since loading the
# cairo.lablgtk2 package from the toplevel tries to load lablgtk2 as