From e3183d75e3aac9b0aae7cb4e9d2ebe7f71cc03c9 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 16 Jan 2022 10:32:15 +0100 Subject: [PATCH] ocamlPackages.lablgtk: disable glade support --- pkgs/development/ocaml-modules/lablgtk/2.14.0.nix | 4 ++-- pkgs/development/ocaml-modules/lablgtk/default.nix | 4 ++-- pkgs/top-level/ocaml-packages.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix index 232621ad83ba..f64b6571970b 100644 --- a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix +++ b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix @@ -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" ]; diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index 09487ac9dad7..cff33022b78c 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -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" ]; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index e77eff16c04d..9f2a178324a1 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -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 =