diff options
| author | volth <volth@webmaster.ms> | 2018-10-13 13:22:11 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-13 13:22:11 +0000 |
| commit | a974ecf803ff858e65f4e6172bdf8d35ec5019f2 (patch) | |
| tree | b2353dc656b6157820928d029a9da07e078e7987 /pkgs/applications/graphics | |
| parent | ccd4024c56df7a084d112779daafa5ddc1a09e24 (diff) | |
| parent | 548ced628d233e6ec5431ae3d8d1668d65177639 (diff) | |
| download | nixlib-a974ecf803ff858e65f4e6172bdf8d35ec5019f2.tar nixlib-a974ecf803ff858e65f4e6172bdf8d35ec5019f2.tar.gz nixlib-a974ecf803ff858e65f4e6172bdf8d35ec5019f2.tar.bz2 nixlib-a974ecf803ff858e65f4e6172bdf8d35ec5019f2.tar.lz nixlib-a974ecf803ff858e65f4e6172bdf8d35ec5019f2.tar.xz nixlib-a974ecf803ff858e65f4e6172bdf8d35ec5019f2.tar.zst nixlib-a974ecf803ff858e65f4e6172bdf8d35ec5019f2.zip | |
Merge branch 'staging' into remove-top-perlXMLParser
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/dia/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index 326166fdfb60..0ce160242e56 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, autoconf, automake, libtool, gtk2, pkgconfig, perlPackages, libxml2, gettext, python, libxml2Python, docbook5, docbook_xsl, libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui, hicolor-icon-theme, -gtk-mac-integration }: +gtk-mac-integration-gtk2 }: stdenv.mkDerivation rec { name = "dia-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { [ gtk2 libxml2 gettext python libxml2Python docbook5 libxslt docbook_xsl libart_lgpl hicolor-icon-theme ] ++ 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 ] ++ (with perlPackages; [ perl XMLParser ]); |