From 83668bc0df91724c879adc6b6ec15cc195f07ae7 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Wed, 7 Dec 2022 02:40:19 -0800 Subject: [PATCH] openafs: Fix incorrectly required and inverted withNcurses parameter Introduced by commit cc7deb7e4a1b34d539230abe33ace25e41953b53 (#187862). Signed-off-by: Anders Kaseorg --- pkgs/servers/openafs/1.8/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/openafs/1.8/default.nix b/pkgs/servers/openafs/1.8/default.nix index fb6dcdeecde8..d6e2f20ecdbe 100644 --- a/pkgs/servers/openafs/1.8/default.nix +++ b/pkgs/servers/openafs/1.8/default.nix @@ -18,7 +18,7 @@ , withDevdoc ? false , doxygen , dblatex # Extra developer documentation -, withNcurses +, withNcurses ? false , ncurses # Extra ncurses utilities. Needed for debugging and monitoring. , withTsm ? false , tsm-client # Tivoli Storage Manager Backup Client from IBM @@ -45,7 +45,7 @@ stdenv.mkDerivation { bison ] ++ optionals withDevdoc [ doxygen dblatex ]; - buildInputs = [ libkrb5 ncurses ]; + buildInputs = [ libkrb5 ] ++ optional withNcurses ncurses; patches = [ ./bosserver.patch ./cross-build.patch ] ++ optional withTsm ./tsmbac.patch; @@ -84,7 +84,7 @@ stdenv.mkDerivation { "--disable-fuse-client" "--with-docbook-stylesheets=${docbook_xsl}/share/xml/docbook-xsl" ${optionalString withTsm "--enable-tivoli-tsm"} - ${optionalString withNcurses "--disable-gtx"} + ${optionalString (!withNcurses) "--disable-gtx"} "--disable-linux-d_splice-alias-extra-iput" ) '' + optionalString withTsm ''