···

       
1
       
1
       
-
       
{ stdenv, hostPlatform, fetchurl, pkgconfig, gettext, perl, python

     

       
1
       
1
       
+
       
{ stdenv, hostPlatform, fetchurl, pkgconfig, perl, python

     

       
2
       
2
       
 
       
, libiconv, libintl, zlib, libffi, pcre, libelf, gnome3

     

       
3
       
3
       
 
       
# use utillinuxMinimal to avoid circular dependency (utillinux, systemd, glib)

     

       
4
       
4
       
 
       
, utillinuxMinimal ? null

     
···

       
66
       
66
       
 
       
    ++ optionals stdenv.isLinux [ utillinuxMinimal ] # for libmount

     

       
67
       
67
       
 
       
    ++ optionals doCheck [ tzdata libxml2 desktop-file-utils shared-mime-info ];

     

       
68
       
68
       
 
       


     

       
69
       
69
       
-
       
  nativeBuildInputs = [ pkgconfig gettext perl python libintl libiconv ];

     

       
69
       
69
       
+
       
  nativeBuildInputs = [ pkgconfig perl python ];

     

       
70
       
70
       
 
       


     

       
71
       
71
       
-
       
  propagatedBuildInputs = [ zlib libffi ];

     

       
71
       
71
       
+
       
  propagatedBuildInputs = [ zlib libffi gettext libiconv ];

     

       
72
       
72
       
 
       


     

       
73
       
73
       
 
       
  # internal pcre would only add <200kB, but it's relatively common

     

       
74
       
74
       
 
       
  configureFlags = [ "--with-pcre=system" ]