openafs: remove null overwrites, fix tsm package name, move openafs_1_8 to aliases
This commit is contained in:
parent
eaf476b608
commit
cc7deb7e4a
|
@ -18,8 +18,10 @@
|
|||
, withDevdoc ? false
|
||||
, doxygen
|
||||
, dblatex # Extra developer documentation
|
||||
, withNcurses
|
||||
, ncurses # Extra ncurses utilities. Needed for debugging and monitoring.
|
||||
, tsmbac ? null # Tivoli Storage Manager Backup Client from IBM
|
||||
, withTsm ? false
|
||||
, tsm-client # Tivoli Storage Manager Backup Client from IBM
|
||||
}:
|
||||
|
||||
with (import ./srcs.nix { inherit fetchurl; });
|
||||
|
@ -45,7 +47,8 @@ stdenv.mkDerivation {
|
|||
|
||||
buildInputs = [ libkrb5 ncurses ];
|
||||
|
||||
patches = [ ./bosserver.patch ./cross-build.patch ] ++ optional (tsmbac != null) ./tsmbac.patch;
|
||||
patches = [ ./bosserver.patch ./cross-build.patch ]
|
||||
++ optional withTsm ./tsmbac.patch;
|
||||
|
||||
outputs = [ "out" "dev" "man" "doc" ] ++ optional withDevdoc "devdoc";
|
||||
|
||||
|
@ -80,12 +83,12 @@ stdenv.mkDerivation {
|
|||
"--disable-kernel-module"
|
||||
"--disable-fuse-client"
|
||||
"--with-docbook-stylesheets=${docbook_xsl}/share/xml/docbook-xsl"
|
||||
${optionalString (tsmbac != null) "--enable-tivoli-tsm"}
|
||||
${optionalString (ncurses == null) "--disable-gtx"}
|
||||
${optionalString withTsm "--enable-tivoli-tsm"}
|
||||
${optionalString withNcurses "--disable-gtx"}
|
||||
"--disable-linux-d_splice-alias-extra-iput"
|
||||
)
|
||||
'' + optionalString (tsmbac != null) ''
|
||||
export XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I${tsmbac}/lib64/sample -DXBSA_TSMLIB=\\\"${tsmbac}/lib64/libApiTSM64.so\\\""
|
||||
'' + optionalString withTsm ''
|
||||
export XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I${tsm-client}/lib64/sample -DXBSA_TSMLIB=\\\"${tsm-client}/lib64/libApiTSM64.so\\\""
|
||||
export XBSA_XLIBS="-ldl"
|
||||
'';
|
||||
|
||||
|
|
|
@ -990,6 +990,7 @@ mapAliases ({
|
|||
odpdown = throw "odpdown has been removed because it lacks python3 support"; # Added 2022-04-25
|
||||
ofp = throw "ofp is not compatible with odp-dpdk";
|
||||
olifant = throw "olifant has been removed from nixpkgs, as it was unmaintained"; # Added 2021-08-05
|
||||
openafs_1_8 = openafs; # Added 2022-08-22
|
||||
openbazaar = throw "openbazzar has been removed from nixpkgs as upstream has abandoned the project"; # Added 2022-01-06
|
||||
openbazaar-client = throw "openbazzar-client has been removed from nixpkgs as upstream has abandoned the project"; # Added 2022-01-06
|
||||
opencascade_oce = throw "'opencascade_oce' has been renamed to/replaced by 'opencascade'"; # Converted to throw 2022-02-22
|
||||
|
|
|
@ -22876,9 +22876,7 @@ with pkgs;
|
|||
|
||||
openbgpd = callPackage ../servers/openbgpd { };
|
||||
|
||||
openafs_1_8 = callPackage ../servers/openafs/1.8 { tsmbac = null; ncurses = null; };
|
||||
# Current stable release; don't backport release updates!
|
||||
openafs = openafs_1_8;
|
||||
openafs = callPackage ../servers/openafs/1.8 { };
|
||||
|
||||
openresty = callPackage ../servers/http/openresty {
|
||||
withPerl = false;
|
||||
|
|
Loading…
Reference in a new issue