MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 23:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

openafs_1_8: Cleanup build and fix build issues

Browse source 
Parallel building is broken, leading to failing builds in very rare
cases. (volint.h not yet built while alredy needed when compiling volser.)
This commit is contained in:
Michael Raitza 2020-10-02 11:58:46 +02:00 committed by Jörg Thalheim
parent c6372e3758
commit 62a34589b8
No known key found for this signature in database
GPG key ID: 003F2096411B5F92
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
pkgs/servers/openafs/1.8/default.nix
View file

@ -1,13 +1,15 @@
{ stdenv, buildPackages, fetchurl, which, autoconf, automake, flex
, yacc , glibc, perl, kerberos, libxslt, docbook_xsl
, docbook_xml_dtd_43 , libtool_2, removeReferencesTo
, ncurses # Extra ncurses utilities. Only needed for debugging.
, yacc , glibc, perl, kerberos, libxslt, docbook_xsl, file
, ncurses # Extra ncurses utilities. Needed for debugging and monitoring.
, tsmbac ? null # Tivoli Storage Manager Backup Client from IBM
}:
with (import ./srcs.nix { inherit fetchurl; });
let
inherit (stdenv.lib) optional optionalString optionals;
stdenv.mkDerivation {
in stdenv.mkDerivation {
pname = "openafs";
inherit version srcs;
@ -17,11 +19,11 @@ stdenv.mkDerivation {
buildInputs = [ kerberos ncurses ];
patches = [ ./bosserver.patch ./cross-build.patch ] ++ stdenv.lib.optional (tsmbac != null) ./tsmbac.patch;
patches = [ ./bosserver.patch ./cross-build.patch ] ++ optional (tsmbac != null) ./tsmbac.patch;
outputs = [ "out" "dev" "man" "doc" "server" ];
enableParallelBuilding = true;
enableParallelBuilding = false;
setOutputFlags = false;
@ -44,19 +46,20 @@ stdenv.mkDerivation {
./regen.sh
configureFlagsArray=(
"--with-gssapi"
"--sysconfdir=/etc"
"--localstatedir=/var"
"--disable-kernel-module"
"--disable-fuse-client"
"--with-html-xsl=${docbook_xsl}/share/xml/docbook-xsl/html/chunk.xsl"
${stdenv.lib.optionalString (tsmbac != null) "--enable-tivoli-tsm"}
${stdenv.lib.optionalString (ncurses == null) "--disable-gtx"}
"--with-docbook-stylesheets=${docbook_xsl}/share/xml/docbook-xsl"
${optionalString (tsmbac != null) "--enable-tivoli-tsm"}
${optionalString (ncurses == null) "--disable-gtx"}
"--disable-linux-d_splice-alias-extra-iput"
"--libexecdir=$server/libexec"
)
'' + stdenv.lib.optionalString (tsmbac != null) ''
'' + optionalString (tsmbac != null) ''
export XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I${tsmbac}/lib64/sample -DXBSA_TSMLIB=\\\"${tsmbac}/lib64/libApiTSM64.so\\\""
export XBSA_XLIBS="-ldl"
'';