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