diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-01-10 07:13:44 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-01-12 14:07:16 +0000 |
commit | e2698550456abba83c6dcd5d5e5a9990a0b96f8a (patch) | |
tree | 79a56f0df3fa55e470d84b4dff6059fbf487ec18 /nixpkgs/pkgs/development/libraries/gtk-sharp | |
parent | 1cdc42df888dc98c347e03bd942ed9825a55bcb3 (diff) | |
parent | 84d74ae9c9cbed73274b8e4e00be14688ffc93fe (diff) | |
download | nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.gz nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.bz2 nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.lz nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.xz nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.zst nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.zip |
Merge commit '84d74ae9c9cbed73274b8e4e00be14688ffc93fe'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/gtk-sharp')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/gtk-sharp/3.0.nix | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/nixpkgs/pkgs/development/libraries/gtk-sharp/3.0.nix b/nixpkgs/pkgs/development/libraries/gtk-sharp/3.0.nix index f8f1f20cc2fd..49405c655e15 100644 --- a/nixpkgs/pkgs/development/libraries/gtk-sharp/3.0.nix +++ b/nixpkgs/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 }; } |