Merge pull request #109101 from Mic92/xsd

pkgs/development/libraries/xsd/default.nix

@@ -1,9 +1,8 @@
 { stdenv, fetchurl, xercesc }:
 
 let
-  fixed_paths = ''LDFLAGS="-L${xercesc}/lib" CPPFLAGS="-I${xercesc}/include"'';
 in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "xsd";
   version = "4.0.0";
 
@@ -14,20 +13,22 @@ stdenv.mkDerivation {
 
   patches = [ ./xsdcxx.patch ];
 
-  configurePhase = ''
+  postPatch = ''
     patchShebangs .
   '';
 
-  buildPhase = ''
-    make ${fixed_paths}
-  '';
+  enableParallelBuilding = true;
+
+  buildFlags = [
+    "LDFLAGS=-L${xercesc}/lib"
+    "CPPFLAGS=-I${xercesc}/include"
+  ];
+  installFlags = buildFlags ++ [
+    "install_prefix=${placeholder "out"}"
+  ];
 
   buildInputs = [ xercesc ];
 
-  installPhase = ''
-    make ${fixed_paths} install_prefix="$out" install
-  '';
-
   meta = {
     homepage = "http://www.codesynthesis.com/products/xsd";
     description = "An open-source, cross-platform W3C XML Schema to C++ data binding compiler";

pkgs/top-level/all-packages.nix

@@ -25681,7 +25681,9 @@ in
 
   xrgears = callPackage ../applications/graphics/xrgears { };
 
-  xsd = callPackage ../development/libraries/xsd { };
+  xsd = callPackage ../development/libraries/xsd {
+    stdenv = gcc9Stdenv;
+  };
 
   xscope = callPackage ../applications/misc/xscope { };