treewide: remove libintl hacks
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
{ fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2
|
||||
, python, perl, gdk_pixbuf, libiconv, libintlOrEmpty }:
|
||||
, python, perl, gdk_pixbuf, libiconv, libintl }:
|
||||
|
||||
let inherit (stdenv.lib) optionals; in
|
||||
|
||||
@@ -11,21 +11,18 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1hhdz0ymda26q6bl5ygickkgrh998lxqq4z9i8dzpcvqna3zpzr9";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig intltool ];
|
||||
nativeBuildInputs = [ pkgconfig intltool libintl ];
|
||||
|
||||
buildInputs = [ gettext bzip2 zlib python ]
|
||||
++ stdenv.lib.optional doCheck perl;
|
||||
|
||||
propagatedBuildInputs = [ libxml2 glib gdk_pixbuf libiconv ]
|
||||
++ libintlOrEmpty;
|
||||
propagatedBuildInputs = [ libxml2 glib gdk_pixbuf libiconv ];
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
doCheck = true;
|
||||
preCheck = "patchShebangs ./tests/";
|
||||
|
||||
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "GNOME's Structured File Library";
|
||||
homepage = https://www.gnome.org/projects/libgsf;
|
||||
|
||||
Reference in New Issue
Block a user