Merge pull request #109101 from Mic92/xsd

authored by Jörg Thalheim and committed by GitHub 5322c1f7 f620cda9

+14 -11
+11 -10
pkgs/development/libraries/xsd/default.nix
··· 1 1 { stdenv, fetchurl, xercesc }: 2 2 3 3 let 4 - fixed_paths = ''LDFLAGS="-L${xercesc}/lib" CPPFLAGS="-I${xercesc}/include"''; 5 4 in 6 - stdenv.mkDerivation { 5 + stdenv.mkDerivation rec { 7 6 pname = "xsd"; 8 7 version = "4.0.0"; 9 8 ··· 14 13 15 14 patches = [ ./xsdcxx.patch ]; 16 15 17 - configurePhase = '' 16 + postPatch = '' 18 17 patchShebangs . 19 18 ''; 20 19 21 - buildPhase = '' 22 - make ${fixed_paths} 23 - ''; 20 + enableParallelBuilding = true; 21 + 22 + buildFlags = [ 23 + "LDFLAGS=-L${xercesc}/lib" 24 + "CPPFLAGS=-I${xercesc}/include" 25 + ]; 26 + installFlags = buildFlags ++ [ 27 + "install_prefix=${placeholder "out"}" 28 + ]; 24 29 25 30 buildInputs = [ xercesc ]; 26 - 27 - installPhase = '' 28 - make ${fixed_paths} install_prefix="$out" install 29 - ''; 30 31 31 32 meta = { 32 33 homepage = "http://www.codesynthesis.com/products/xsd";
+3 -1
pkgs/top-level/all-packages.nix
··· 25681 25681 25682 25682 xrgears = callPackage ../applications/graphics/xrgears { }; 25683 25683 25684 - xsd = callPackage ../development/libraries/xsd { }; 25684 + xsd = callPackage ../development/libraries/xsd { 25685 + stdenv = gcc9Stdenv; 25686 + }; 25685 25687 25686 25688 xscope = callPackage ../applications/misc/xscope { }; 25687 25689