git.iko.soy/typeable/nixpkgs
on master help sign in
openafs_1_8: Cleanup build and fix build issues

Parallel building is broken, leading to failing builds in very rare cases. (volint.h not yet built while alredy needed when compiling volser.)

commit62a34589b8cf2da71f3e7fdb5b5003b83710d00e authorMichael Raitza <michael.raitza@tu-dresden.de> dateFri 2 Oct 2020, 11:58 (6 years ago) parentc6372e3
1 file changed+12−9
pkgs/servers/openafs/1.8/default.nix+12−9
pkgs/servers/openafs/1.8/default.nix+12−9
@@ -1,13 +1,15 @@
11{ stdenv, buildPackages, fetchurl, which, autoconf, automake, flex
2−, yacc , glibc, perl, kerberos, libxslt, docbook_xsl
32, docbook_xml_dtd_43 , libtool_2, removeReferencesTo
4−, ncurses # Extra ncurses utilities. Only needed for debugging.
3+, yacc , glibc, perl, kerberos, libxslt, docbook_xsl, file
4+, ncurses # Extra ncurses utilities. Needed for debugging and monitoring.
55, tsmbac ? null # Tivoli Storage Manager Backup Client from IBM
66}:
77
88with (import ./srcs.nix { inherit fetchurl; });
9+let
10+ inherit (stdenv.lib) optional optionalString optionals;
911
10−stdenv.mkDerivation {
12+in stdenv.mkDerivation {
1113 pname = "openafs";
1214 inherit version srcs;
1315
@@ -17,11 +19,11 @@ stdenv.mkDerivation {
1719
1820 buildInputs = [ kerberos ncurses ];
1921
20− patches = [ ./bosserver.patch ./cross-build.patch ] ++ stdenv.lib.optional (tsmbac != null) ./tsmbac.patch;
22+ patches = [ ./bosserver.patch ./cross-build.patch ] ++ optional (tsmbac != null) ./tsmbac.patch;
2123
2224 outputs = [ "out" "dev" "man" "doc" "server" ];
2325
24− enableParallelBuilding = true;
26+ enableParallelBuilding = false;
2527
2628 setOutputFlags = false;
2729
@@ -44,19 +46,20 @@ stdenv.mkDerivation {
4446
4547 ./regen.sh
4648
49+
4750 configureFlagsArray=(
4851 "--with-gssapi"
4952 "--sysconfdir=/etc"
5053 "--localstatedir=/var"
5154 "--disable-kernel-module"
5255 "--disable-fuse-client"
53− "--with-html-xsl=${docbook_xsl}/share/xml/docbook-xsl/html/chunk.xsl"
54− ${stdenv.lib.optionalString (tsmbac != null) "--enable-tivoli-tsm"}
55− ${stdenv.lib.optionalString (ncurses == null) "--disable-gtx"}
56+ "--with-docbook-stylesheets=${docbook_xsl}/share/xml/docbook-xsl"
57+ ${optionalString (tsmbac != null) "--enable-tivoli-tsm"}
58+ ${optionalString (ncurses == null) "--disable-gtx"}
5659 "--disable-linux-d_splice-alias-extra-iput"
5760 "--libexecdir=$server/libexec"
5861 )
59− '' + stdenv.lib.optionalString (tsmbac != null) ''
62+ '' + optionalString (tsmbac != null) ''
6063 export XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I${tsmbac}/lib64/sample -DXBSA_TSMLIB=\\\"${tsmbac}/lib64/libApiTSM64.so\\\""
6164 export XBSA_XLIBS="-ldl"
6265 '';