misc pkgs: Manual fixup pkgconfig nativeBuildInputs after sed

Importantly, this included regenerating pkgs/servers/x11/xorg, to
clobber the old sed.
This commit is contained in:
John Ericson
2017-09-05 18:03:42 -04:00
parent 531e4b80c9
commit f8a18cd4cf
29 changed files with 312 additions and 293 deletions

View File

@@ -47,10 +47,9 @@ in stdenv.mkDerivation ({
inherit src version;
nativeBuildInputs = [ autoreconfHook makeWrapper perl ];
nativeBuildInputs = [ autoreconfHook makeWrapper perl gnum4 libxslt libxml2 ];
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ gnum4 ncurses openssl libxslt libxml2 ]
buildInputs = [ ncurses openssl ]
++ optionals wxSupport wxPackages2
++ optionals odbcSupport odbcPackages
++ optionals javacSupport javacPackages