dia: fix on darwin (#48176)
Fixes runtime error: GTK+ 2.x symbols detected. Using GTK+ 2.x and GTK+ 3 in the same process is not supported
This commit is contained in:
parent
05f0026af3
commit
c047572a17
|
@ -1,7 +1,7 @@
|
||||||
{ stdenv, fetchgit, autoconf, automake, libtool, gtk2, pkgconfig, perl,
|
{ stdenv, fetchgit, autoconf, automake, libtool, gtk2, pkgconfig, perl,
|
||||||
perlXMLParser, libxml2, gettext, python, libxml2Python, docbook5, docbook_xsl,
|
perlXMLParser, libxml2, gettext, python, libxml2Python, docbook5, docbook_xsl,
|
||||||
libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui, hicolor-icon-theme,
|
libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui, hicolor-icon-theme,
|
||||||
gtk-mac-integration }:
|
gtk-mac-integration-gtk2 }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "dia-${version}";
|
name = "dia-${version}";
|
||||||
|
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||||
[ gtk2 perlXMLParser libxml2 gettext python libxml2Python docbook5
|
[ gtk2 perlXMLParser libxml2 gettext python libxml2Python docbook5
|
||||||
libxslt docbook_xsl libart_lgpl hicolor-icon-theme ]
|
libxslt docbook_xsl libart_lgpl hicolor-icon-theme ]
|
||||||
++ stdenv.lib.optional withGNOME libgnomeui
|
++ stdenv.lib.optional withGNOME libgnomeui
|
||||||
++ stdenv.lib.optional stdenv.isDarwin gtk-mac-integration;
|
++ stdenv.lib.optional stdenv.isDarwin gtk-mac-integration-gtk2;
|
||||||
|
|
||||||
nativeBuildInputs = [ autoconf automake libtool pkgconfig intltool perl ];
|
nativeBuildInputs = [ autoconf automake libtool pkgconfig intltool perl ];
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue