diff options
author | Daniel Șerbănescu <daniel@serbanescu.dk> | 2020-07-13 12:22:23 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2020-07-13 16:27:37 +0200 |
commit | 8958237f388d8d7acebcffb63583dcaffa40c57a (patch) | |
tree | e144603ec46e77b62ba73fe769079796776cd246 | |
parent | 6206029f69376d5a61cd205cfe6e886303098b0f (diff) | |
download | nixpkgs-8958237f388d8d7acebcffb63583dcaffa40c57a.tar nixpkgs-8958237f388d8d7acebcffb63583dcaffa40c57a.tar.gz nixpkgs-8958237f388d8d7acebcffb63583dcaffa40c57a.tar.bz2 nixpkgs-8958237f388d8d7acebcffb63583dcaffa40c57a.tar.lz nixpkgs-8958237f388d8d7acebcffb63583dcaffa40c57a.tar.xz nixpkgs-8958237f388d8d7acebcffb63583dcaffa40c57a.tar.zst nixpkgs-8958237f388d8d7acebcffb63583dcaffa40c57a.zip |
gtk-sharp3: fixed build and removed broken flag.
-rw-r--r-- | pkgs/development/libraries/gtk-sharp/3.0.nix | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/pkgs/development/libraries/gtk-sharp/3.0.nix b/pkgs/development/libraries/gtk-sharp/3.0.nix index f8f1f20cc2f..49405c655e1 100644 --- a/pkgs/development/libraries/gtk-sharp/3.0.nix +++ b/pkgs/development/libraries/gtk-sharp/3.0.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchurl, pkgconfig, mono +{ stdenv +, fetchurl +, fetchpatch +, pkgconfig +, mono , glib , pango , gtk3 @@ -14,29 +18,32 @@ , monoDLLFixer }: -stdenv.mkDerivation { - name = "gtk-sharp-2.99.3"; +stdenv.mkDerivation rec { + pname = "gtk-sharp"; + version = "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"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.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 - # ''; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ mono glib pango gtk3 GConf libglade libgnomecanvas libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2 ]; + patches = [ + # Fixes MONO_PROFILE_ENTER_LEAVE undeclared when compiling against newer versions of mono. + # @see https://github.com/mono/gtk-sharp/pull/266 + (fetchpatch { + name = "MONO_PROFILE_ENTER_LEAVE.patch"; + url = "https://github.com/mono/gtk-sharp/commit/401df51bc461de93c1a78b6a7a0d5adc63cf186c.patch"; + sha256 = "0hrkcr5a7wkixnyp60v4d6j3arsb63h54rd30lc5ajfjb3p92kcf"; + }) + ]; + dontStrip = true; inherit monoDLLFixer; @@ -47,6 +54,5 @@ stdenv.mkDerivation { meta = { platforms = stdenv.lib.platforms.linux; - broken = true; # 2018-09-21, build has failed since 2018-04-28 }; } |