summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorAl Zohali <zohl@fmap.me>2016-01-24 15:43:13 +0300
committerAl Zohali <zohl@fmap.me>2016-03-07 23:21:01 +0300
commitd778ab0cb01bf836f6926fa31dcdbda07cce3abf (patch)
tree369f7db2be90819ed914ded23314f131ae97b887 /pkgs
parentec0ffd9078525dfd7a01463ddcbc56d218d1b697 (diff)
downloadnixlib-d778ab0cb01bf836f6926fa31dcdbda07cce3abf.tar
nixlib-d778ab0cb01bf836f6926fa31dcdbda07cce3abf.tar.gz
nixlib-d778ab0cb01bf836f6926fa31dcdbda07cce3abf.tar.bz2
nixlib-d778ab0cb01bf836f6926fa31dcdbda07cce3abf.tar.lz
nixlib-d778ab0cb01bf836f6926fa31dcdbda07cce3abf.tar.xz
nixlib-d778ab0cb01bf836f6926fa31dcdbda07cce3abf.tar.zst
nixlib-d778ab0cb01bf836f6926fa31dcdbda07cce3abf.zip
gtk-sharp-3_0: init at 2.99.3
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/gtk-sharp/2.0.nix (renamed from pkgs/development/libraries/gtk-sharp-2/default.nix)0
-rw-r--r--pkgs/development/libraries/gtk-sharp/3.0.nix48
-rw-r--r--pkgs/development/libraries/gtk-sharp/builder.sh (renamed from pkgs/development/libraries/gtk-sharp-2/builder.sh)0
-rw-r--r--pkgs/top-level/all-packages.nix10
4 files changed, 57 insertions, 1 deletions
diff --git a/pkgs/development/libraries/gtk-sharp-2/default.nix b/pkgs/development/libraries/gtk-sharp/2.0.nix
index 0e659fb074bd..0e659fb074bd 100644
--- a/pkgs/development/libraries/gtk-sharp-2/default.nix
+++ b/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 <glib/.*\.h>,#include <glib.h>,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
index 4b8f757540b5..4b8f757540b5 100644
--- a/pkgs/development/libraries/gtk-sharp-2/builder.sh
+++ b/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 { };