git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #109101 from Mic92/xsd
commit5322c1f7d77a99b3f44130a029db42e40c22a399 authorJörg Thalheim <Mic92@users.noreply.github.com> dateTue 12 Jan 2021, 11:56 (6 years ago) parentf620cda37edb33
2 files changed+14−11
pkgs/development/libraries/xsd/default.nix+11−10 pkgs/top-level/all-packages.nix+3−1
pkgs/development/libraries/xsd/default.nix+11−10
@@ -1,9 +1,8 @@
11{ stdenv, fetchurl, xercesc }:
22
33let
4− fixed_paths = ''LDFLAGS="-L${xercesc}/lib" CPPFLAGS="-I${xercesc}/include"'';
54in
6−stdenv.mkDerivation {
5+stdenv.mkDerivation rec {
76 pname = "xsd";
87 version = "4.0.0";
98
@@ -14,19 +13,21 @@ stdenv.mkDerivation {
1413
1514 patches = [ ./xsdcxx.patch ];
1615
17− configurePhase = ''
16+ postPatch = ''
1817 patchShebangs .
1918 '';
2019
21− buildPhase = ''
22− make ${fixed_paths}
23− '';
20+ enableParallelBuilding = true;
2421
25− buildInputs = [ xercesc ];
22+ buildFlags = [
23+ "LDFLAGS=-L${xercesc}/lib"
24+ "CPPFLAGS=-I${xercesc}/include"
25+ ];
26+ installFlags = buildFlags ++ [
27+ "install_prefix=${placeholder "out"}"
28+ ];
2629
27− installPhase = ''
28− make ${fixed_paths} install_prefix="$out" install
29− '';
30+ buildInputs = [ xercesc ];
3031
3132 meta = {
3233 homepage = "http://www.codesynthesis.com/products/xsd";
pkgs/top-level/all-packages.nix+3−1
@@ -25681,7 +25681,9 @@ in
2568125681
2568225682 xrgears = callPackage ../applications/graphics/xrgears { };
2568325683
25684− xsd = callPackage ../development/libraries/xsd { };
25684+ xsd = callPackage ../development/libraries/xsd {
25685+ stdenv = gcc9Stdenv;
25686+ };
2568525687
2568625688 xscope = callPackage ../applications/misc/xscope { };
2568725689