forked from mirrors/nixpkgs
* Update lablgtk2 (and enable hydra build)
svn path=/nixpkgs/trunk/; revision=25213
This commit is contained in:
parent
0af5585d3c
commit
d43bda0086
|
@ -1,15 +1,21 @@
|
|||
{stdenv, fetchurl, ocaml, pkgconfig, gtk, libgnomecanvas}:
|
||||
|
||||
stdenv.mkDerivation (rec {
|
||||
version = "2.12.0";
|
||||
version = "2.14.2";
|
||||
name = "lablgtk-${version}";
|
||||
src = fetchurl {
|
||||
url = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/${name}.tar.gz";
|
||||
sha256 = "1kflrg4rqqzrz0ffdzlhz510m82k21m5x78yr5nxd98avcd39qxk";
|
||||
sha256 = "1fnh0amm7lwgyjdhmlqgsp62gwlar1140425yc1j6inwmgnsp0a9";
|
||||
};
|
||||
|
||||
buildInputs = [ocaml pkgconfig gtk libgnomecanvas];
|
||||
|
||||
configureFlags = "--with-libdir=$(out)/lib/ocaml";
|
||||
buildFlags = "world";
|
||||
meta = {
|
||||
platforms = ocaml.meta.platforms;
|
||||
maintainers = [
|
||||
stdenv.lib.maintainers.z77z
|
||||
];
|
||||
};
|
||||
})
|
||||
|
|
|
@ -2001,6 +2001,10 @@ let
|
|||
|
||||
findlib = callPackage ../development/tools/ocaml/findlib { };
|
||||
|
||||
lablgtk = callPackage ../development/libraries/lablgtk {
|
||||
inherit (gnome) libgnomecanvas;
|
||||
};
|
||||
|
||||
menhir = callPackage ../development/ocaml-modules/menhir { };
|
||||
|
||||
ocaml_batteries = callPackage ../development/ocaml-modules/batteries { };
|
||||
|
@ -3246,10 +3250,6 @@ let
|
|||
|
||||
krb5 = callPackage ../development/libraries/kerberos/krb5.nix { };
|
||||
|
||||
lablgtk = callPackage ../development/libraries/lablgtk {
|
||||
inherit (gnome) libgnomecanvas;
|
||||
};
|
||||
|
||||
lcms = lcms1;
|
||||
|
||||
lcms1 = callPackage ../development/libraries/lcms { };
|
||||
|
@ -6119,7 +6119,8 @@ let
|
|||
};
|
||||
|
||||
monotoneViz = builderDefsPackage (import ../applications/version-management/monotone-viz/mtn-head.nix) {
|
||||
inherit ocaml lablgtk graphviz pkgconfig autoconf automake libtool;
|
||||
inherit ocaml graphviz pkgconfig autoconf automake libtool;
|
||||
inherit (ocamlPackages) lablgtk;
|
||||
inherit (gnome) gtk libgnomecanvas glib;
|
||||
};
|
||||
|
||||
|
@ -6432,7 +6433,9 @@ let
|
|||
boost = boostFull;
|
||||
};
|
||||
|
||||
unison = callPackage ../applications/networking/sync/unison { };
|
||||
unison = callPackage ../applications/networking/sync/unison {
|
||||
inherit (ocamlPackages) lablgtk;
|
||||
};
|
||||
|
||||
uucp = callPackage ../tools/misc/uucp { };
|
||||
|
||||
|
@ -7012,7 +7015,7 @@ let
|
|||
### SCIENCE/LOGIC
|
||||
|
||||
coq = callPackage ../applications/science/logic/coq {
|
||||
inherit (ocamlPackages) findlib;
|
||||
inherit (ocamlPackages) findlib lablgtk;
|
||||
camlp5 = ocamlPackages.camlp5_transitional;
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue