libhandy: build glade catalog separately
So that libhandy itself does not have webkitgtk in build time closure through glade.
This commit is contained in:
parent
1579a427cd
commit
adedc49f60
@ -10,6 +10,7 @@
|
|||||||
, docbook-xsl-nons
|
, docbook-xsl-nons
|
||||||
, docbook_xml_dtd_43
|
, docbook_xml_dtd_43
|
||||||
, gtk3
|
, gtk3
|
||||||
|
, enableGlade ? false
|
||||||
, glade
|
, glade
|
||||||
, dbus
|
, dbus
|
||||||
, xvfb_run
|
, xvfb_run
|
||||||
@ -20,13 +21,21 @@
|
|||||||
, at-spi2-atk
|
, at-spi2-atk
|
||||||
, at-spi2-core
|
, at-spi2-core
|
||||||
, gnome3
|
, gnome3
|
||||||
|
, libhandy
|
||||||
|
, replaceDependency
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "libhandy";
|
pname = "libhandy";
|
||||||
version = "1.2.2";
|
version = "1.2.2";
|
||||||
|
|
||||||
outputs = [ "out" "dev" "devdoc" "glade" ];
|
outputs = [
|
||||||
|
"out"
|
||||||
|
"dev"
|
||||||
|
"devdoc"
|
||||||
|
] ++ lib.optionals enableGlade [
|
||||||
|
"glade"
|
||||||
|
];
|
||||||
outputBin = "dev";
|
outputBin = "dev";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
@ -48,9 +57,10 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
gdk-pixbuf
|
gdk-pixbuf
|
||||||
glade
|
|
||||||
gtk3
|
gtk3
|
||||||
libxml2
|
libxml2
|
||||||
|
] ++ lib.optionals enableGlade [
|
||||||
|
glade
|
||||||
];
|
];
|
||||||
|
|
||||||
checkInputs = [
|
checkInputs = [
|
||||||
@ -64,6 +74,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
mesonFlags = [
|
mesonFlags = [
|
||||||
"-Dgtk_doc=true"
|
"-Dgtk_doc=true"
|
||||||
|
"-Dglade_catalog=${if enableGlade then "enabled" else "disabled"}"
|
||||||
];
|
];
|
||||||
|
|
||||||
# Uses define_variable in pkg-config, but we still need it to use the glade output
|
# Uses define_variable in pkg-config, but we still need it to use the glade output
|
||||||
@ -85,6 +96,17 @@ stdenv.mkDerivation rec {
|
|||||||
updateScript = gnome3.updateScript {
|
updateScript = gnome3.updateScript {
|
||||||
packageName = pname;
|
packageName = pname;
|
||||||
};
|
};
|
||||||
|
} // lib.optionalAttrs (!enableGlade) {
|
||||||
|
glade =
|
||||||
|
let
|
||||||
|
libhandyWithGlade = libhandy.override {
|
||||||
|
enableGlade = true;
|
||||||
|
};
|
||||||
|
in (replaceDependency {
|
||||||
|
drv = libhandyWithGlade.glade;
|
||||||
|
oldDependency = libhandyWithGlade.out;
|
||||||
|
newDependency = libhandy.out;
|
||||||
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
Loading…
Reference in New Issue
Block a user