@@ -1,6 +1,6 @@
1{ stdenv, buildPackages, fetchurl, which, autoconf, automake, flex
1{ stdenv, buildPackages, fetchurl, which, autoconf, automake, flex
2−, docbook_xml_dtd_43 , libtool_2, removeReferencesTo
3, yacc , glibc, perl, kerberos, libxslt, docbook_xsl, file
2, yacc , glibc, perl, kerberos, libxslt, docbook_xsl, file
3+, docbook_xml_dtd_43, libtool_2
4, ncurses # Extra ncurses utilities. Needed for debugging and monitoring.
4, ncurses # Extra ncurses utilities. Needed for debugging and monitoring.
5, tsmbac ? null # Tivoli Storage Manager Backup Client from IBM
5, tsmbac ? null # Tivoli Storage Manager Backup Client from IBM
@@ -15,13 +15,13 @@ in stdenv.mkDerivation {
16 depsBuildBuild = [ buildPackages.stdenv.cc ];
16 depsBuildBuild = [ buildPackages.stdenv.cc ];
17 nativeBuildInputs = [ autoconf automake flex libxslt libtool_2 perl
17 nativeBuildInputs = [ autoconf automake flex libxslt libtool_2 perl
18− removeReferencesTo which yacc ];
18+ which yacc ];
20 buildInputs = [ kerberos ncurses ];
20 buildInputs = [ kerberos ncurses ];
22 patches = [ ./bosserver.patch ./cross-build.patch ] ++ optional (tsmbac != null) ./tsmbac.patch;
22 patches = [ ./bosserver.patch ./cross-build.patch ] ++ optional (tsmbac != null) ./tsmbac.patch;
24− outputs = [ "out" "dev" "man" "doc" "server" ];
24+ outputs = [ "out" "dev" "man" "doc" ];
26 enableParallelBuilding = false;
26 enableParallelBuilding = false;
@@ -57,7 +57,6 @@ in stdenv.mkDerivation {
57 ${optionalString (tsmbac != null) "--enable-tivoli-tsm"}
57 ${optionalString (tsmbac != null) "--enable-tivoli-tsm"}
58 ${optionalString (ncurses == null) "--disable-gtx"}
58 ${optionalString (ncurses == null) "--disable-gtx"}
59 "--disable-linux-d_splice-alias-extra-iput"
59 "--disable-linux-d_splice-alias-extra-iput"
60− "--libexecdir=$server/libexec"
62 '' + optionalString (tsmbac != null) ''
61 '' + optionalString (tsmbac != null) ''
63 export XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I${tsmbac}/lib64/sample -DXBSA_TSMLIB=\\\"${tsmbac}/lib64/libApiTSM64.so\\\""
62 export XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I${tsmbac}/lib64/sample -DXBSA_TSMLIB=\\\"${tsmbac}/lib64/libApiTSM64.so\\\""
@@ -86,8 +85,6 @@ in stdenv.mkDerivation {
86 # binaries.
85 # binaries.
87 preFixup = ''
86 preFixup = ''
88 rm -rf "$(pwd)" && mkdir "$(pwd)"
87 rm -rf "$(pwd)" && mkdir "$(pwd)"
90− find $out -type f -exec remove-references-to -t $server '{}' '+'
93 meta = with stdenv.lib; {
90 meta = with stdenv.lib; {