gtk-sharp*: remove old optional Gnome2 dependencies
They were marked as optional with `dependency ? null`, however they were references unconditionally in the `buildInputs`. I don't know how all of this ever worked, but it's removed anyways now.
This commit is contained in:
parent
dcc2473370
commit
48e2f6885f
|
@ -6,14 +6,6 @@
|
||||||
, glib
|
, glib
|
||||||
, pango
|
, pango
|
||||||
, gtk2
|
, gtk2
|
||||||
, GConf ? null
|
|
||||||
, libglade ? null
|
|
||||||
, libgtkhtml ? null
|
|
||||||
, gtkhtml ? null
|
|
||||||
, libgnomecanvas ? null
|
|
||||||
, libgnomeui ? null
|
|
||||||
, libgnomeprint ? null
|
|
||||||
, libgnomeprintui ? null
|
|
||||||
, libxml2
|
, libxml2
|
||||||
, monoDLLFixer
|
, monoDLLFixer
|
||||||
, autoconf
|
, autoconf
|
||||||
|
@ -54,8 +46,8 @@ stdenv.mkDerivation rec {
|
||||||
nativeBuildInputs = [ pkg-config autoconf automake libtool which ];
|
nativeBuildInputs = [ pkg-config autoconf automake libtool which ];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
mono glib pango gtk2 GConf libglade libgnomecanvas
|
mono glib pango gtk2
|
||||||
libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2
|
libxml2
|
||||||
];
|
];
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
|
|
|
@ -6,14 +6,6 @@
|
||||||
, glib
|
, glib
|
||||||
, pango
|
, pango
|
||||||
, gtk3
|
, gtk3
|
||||||
, GConf ? null
|
|
||||||
, libglade ? null
|
|
||||||
, libgtkhtml ? null
|
|
||||||
, gtkhtml ? null
|
|
||||||
, libgnomecanvas ? null
|
|
||||||
, libgnomeui ? null
|
|
||||||
, libgnomeprint ? null
|
|
||||||
, libgnomeprintui ? null
|
|
||||||
, libxml2
|
, libxml2
|
||||||
, monoDLLFixer
|
, monoDLLFixer
|
||||||
}:
|
}:
|
||||||
|
@ -30,8 +22,8 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
mono glib pango gtk3 GConf libglade libgnomecanvas
|
mono glib pango gtk3
|
||||||
libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2
|
libxml2
|
||||||
];
|
];
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
|
|
@ -17057,17 +17057,9 @@ with pkgs;
|
||||||
|
|
||||||
gtk-engine-murrine = callPackage ../development/libraries/gtk-engine-murrine { };
|
gtk-engine-murrine = callPackage ../development/libraries/gtk-engine-murrine { };
|
||||||
|
|
||||||
gtk-sharp-2_0 = callPackage ../development/libraries/gtk-sharp/2.0.nix {
|
gtk-sharp-2_0 = callPackage ../development/libraries/gtk-sharp/2.0.nix { };
|
||||||
inherit (gnome2) libglade libgtkhtml gtkhtml
|
|
||||||
libgnomecanvas libgnomeui libgnomeprint
|
|
||||||
libgnomeprintui GConf;
|
|
||||||
};
|
|
||||||
|
|
||||||
gtk-sharp-3_0 = callPackage ../development/libraries/gtk-sharp/3.0.nix {
|
gtk-sharp-3_0 = callPackage ../development/libraries/gtk-sharp/3.0.nix { };
|
||||||
inherit (gnome2) libglade libgtkhtml gtkhtml
|
|
||||||
libgnomecanvas libgnomeui libgnomeprint
|
|
||||||
libgnomeprintui GConf;
|
|
||||||
};
|
|
||||||
|
|
||||||
gtk-sharp-beans = callPackage ../development/libraries/gtk-sharp-beans { };
|
gtk-sharp-beans = callPackage ../development/libraries/gtk-sharp-beans { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue