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

@@ -32,9 +32,8 @@ let
build = {flags, target}: stdenv.mkDerivation rec {
name = "pixie-${version}";
version = "0-r${commit-count}-${variant}";
nativeBuildInputs = libs;
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper pkgconfig ];
buildInputs = libs;
PYTHON = if buildWithPypy
then "${pypy}/pypy-c/.pypy-c-wrapped"
else "${python2.interpreter}";