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
+2 -5
View File
@@ -1,4 +1,4 @@
{ fetchurl, stdenv, intltool, libintlOrEmpty, pkgconfig, glib, json-glib, libsoup, geoip
{ fetchurl, stdenv, intltool, pkgconfig, glib, json-glib, libsoup, geoip
, dbus, dbus-glib, modemmanager, avahi, glib-networking, wrapGAppsHook, gobjectIntrospection
}:
@@ -18,8 +18,7 @@ stdenv.mkDerivation rec {
pkgconfig intltool wrapGAppsHook gobjectIntrospection
];
buildInputs = libintlOrEmpty ++
[ glib json-glib libsoup geoip
buildInputs = [ glib json-glib libsoup geoip
dbus dbus-glib avahi
] ++ optionals (!stdenv.isDarwin) [ modemmanager ];
@@ -37,8 +36,6 @@ stdenv.mkDerivation rec {
"--disable-modem-gps-source"
"--disable-nmea-source" ];
NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl";
postInstall = ''
sed -i $dev/lib/pkgconfig/libgeoclue-2.0.pc -e "s|includedir=.*|includedir=$dev/include|"
'';