misc pkgs: Manual fixup pkgconfig nativeBuildInputs after sed

Importantly, this included regenerating pkgs/servers/x11/xorg, to clobber the old sed.
2017-09-21 15:49:54 -04:00
parent 531e4b80c9
commit f8a18cd4cf
29 changed files with 312 additions and 293 deletions
@@ -13,9 +13,8 @@ with pkgs; rec {
    pythonSupport = false;
  }).overrideDerivation
    (old: { 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+      nativeBuildInputs = old.nativeBuildInputs ++ [ autoreconfHook pkgconfig ];
      buildInputs = old.buildInputs ++ [ zlib nodejs ];
-      nativeBuildInputs = old.nativeBuildInputs ++ [ zlib pkgconfig ];
      # just override it with nothing so it does not fail
      autoreconfPhase = "echo autoreconfPhase not used..."; 
      checkPhase = ''