diff --git a/pkgs/development/libraries/gtk-sharp-2/default.nix b/pkgs/development/libraries/gtk-sharp/2.0.nix similarity index 100% rename from pkgs/development/libraries/gtk-sharp-2/default.nix rename to pkgs/development/libraries/gtk-sharp/2.0.nix diff --git a/pkgs/development/libraries/gtk-sharp/3.0.nix b/pkgs/development/libraries/gtk-sharp/3.0.nix new file mode 100644 index 000000000000..380c43108de0 --- /dev/null +++ b/pkgs/development/libraries/gtk-sharp/3.0.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, pkgconfig, mono +, glib +, pango +, gtk3 +, GConf ? null +, libglade ? null +, libgtkhtml ? null +, gtkhtml ? null +, libgnomecanvas ? null +, libgnomeui ? null +, libgnomeprint ? null +, libgnomeprintui ? null +, gnomepanel ? null +, libxml2 +, monoDLLFixer +}: + +stdenv.mkDerivation { + name = "gtk-sharp-2.99.3"; + + builder = ./builder.sh; + src = fetchurl { + #"mirror://gnome/sources/gtk-sharp/2.99/gtk-sharp-2.99.3.tar.xz"; + url = "http://ftp.gnome.org/pub/GNOME/sources/gtk-sharp/2.99/gtk-sharp-2.99.3.tar.xz"; + sha256 = "18n3l9zcldyvn4lwi8izd62307mkhz873039nl6awrv285qzah34"; + }; + + # patch bad usage of glib, which wasn't tolerated anymore + # prePatch = '' + # for f in glib/glue/{thread,list,slist}.c; do + # sed -i 's,#include ,#include ,g' "$f" + # done + # ''; + + buildInputs = [ + pkgconfig mono glib pango gtk3 GConf libglade libgnomecanvas + libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2 + gnomepanel + ]; + + dontStrip = true; + + inherit monoDLLFixer; + + passthru = { + inherit gtk3; + }; +} diff --git a/pkgs/development/libraries/gtk-sharp-2/builder.sh b/pkgs/development/libraries/gtk-sharp/builder.sh similarity index 100% rename from pkgs/development/libraries/gtk-sharp-2/builder.sh rename to pkgs/development/libraries/gtk-sharp/builder.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2510cf5acdf2..09f97b49d9ef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7044,12 +7044,20 @@ let gtksharp = gtk-sharp; }; - gtk-sharp = callPackage ../development/libraries/gtk-sharp-2 { + gtk-sharp-2_0 = callPackage ../development/libraries/gtk-sharp/2.0.nix { inherit (gnome) libglade libgtkhtml gtkhtml libgnomecanvas libgnomeui libgnomeprint libgnomeprintui GConf gnomepanel; }; + gtk-sharp-3_0 = callPackage ../development/libraries/gtk-sharp/3.0.nix { + inherit (gnome) libglade libgtkhtml gtkhtml + libgnomecanvas libgnomeui libgnomeprint + libgnomeprintui GConf gnomepanel; + }; + + gtk-sharp = gtk-sharp-2_0; + gtkspell = callPackage ../development/libraries/gtkspell { }; gtkspell3 = callPackage ../development/libraries/gtkspell/3.nix { };