treewide: remove libintl hacks

This commit is contained in:
Matthew Bauer
2018-03-22 16:50:11 -05:00
parent 9e75fb5eb4
commit ed2a9cf65f
56 changed files with 107 additions and 199 deletions
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, makeWrapper, pkgconfig
, gtk, girara, ncurses, gettext, docutils
, file, sqlite, glib, texlive, libintlOrEmpty
, file, sqlite, glib, texlive, libintl
, gtk-mac-integration, synctexSupport ? true
}:
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
icon = ./icon.xpm;
nativeBuildInputs = [
pkgconfig
] ++ optional stdenv.isDarwin [ libintlOrEmpty ];
pkgconfig libintl
];
buildInputs = [
file gtk girara
@@ -29,7 +29,6 @@ stdenv.mkDerivation rec {
] ++ optional synctexSupport texlive.bin.core
++ optional stdenv.isDarwin [ gtk-mac-integration ];
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
makeFlags = [