b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

ocamlPackages.lablgtk: disable glade support

Browse source
This commit is contained in:
Vincent Laporte 2022-01-16 10:32:15 +01:00 committed by Vincent Laporte
parent 1c1b91861a
commit e3183d75e3
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/ocaml-modules/lablgtk/2.14.0.nix
View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, ocaml, findlib, pkg-config, gtk2, libgnomecanvas, libglade, gtksourceview, camlp4 }:
{ stdenv, lib, fetchurl, ocaml, findlib, pkg-config, gtk2, libgnomecanvas, gtksourceview, camlp4 }:
if lib.versionAtLeast ocaml.version "4.04"
then throw "lablgtk-2.14 is not available for OCaml ${ocaml.version}" else
@ -17,7 +17,7 @@ stdenv.mkDerivation (rec {
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ ocaml findlib gtk2 libgnomecanvas libglade gtksourceview camlp4 ];
buildInputs = [ ocaml findlib gtk2 libgnomecanvas gtksourceview camlp4 ];
configureFlags = [ "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib" ];
buildFlags = [ "world" ];

4
pkgs/development/ocaml-modules/lablgtk/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchFromGitHub, ocaml, findlib, pkg-config, gtk2, libgnomecanvas, libglade, gtksourceview }:
{ lib, stdenv, fetchurl, fetchFromGitHub, ocaml, findlib, pkg-config, gtk2, libgnomecanvas, gtksourceview }:
let param =
let check = lib.versionAtLeast ocaml.version; in
@ -24,7 +24,7 @@ stdenv.mkDerivation {
inherit (param) version src;
nativeBuildInputs = [ pkg-config ];
buildInputs = [ ocaml findlib gtk2 libgnomecanvas libglade gtksourceview ];
buildInputs = [ ocaml findlib gtk2 libgnomecanvas gtksourceview ];
configureFlags = [ "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib" ];
buildFlags = [ "world" ];

4
pkgs/top-level/ocaml-packages.nix
View file

@ -598,10 +598,10 @@ let
lablgtk3-sourceview3 = callPackage ../development/ocaml-modules/lablgtk3/sourceview3.nix { };
lablgtk_2_14 = callPackage ../development/ocaml-modules/lablgtk/2.14.0.nix {
inherit (pkgs.gnome2) libgnomecanvas libglade gtksourceview;
inherit (pkgs.gnome2) libgnomecanvas gtksourceview;
};
lablgtk = callPackage ../development/ocaml-modules/lablgtk {
inherit (pkgs.gnome2) libgnomecanvas libglade gtksourceview;
inherit (pkgs.gnome2) libgnomecanvas gtksourceview;
};
lablgtk-extras =