From 25628c6454b82e7343050be75a28534cd2472342 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 12 Feb 2021 14:42:53 +0000 Subject: [PATCH] cvs: fix cross; clarify license --- .../applications/version-management/cvs/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/applications/version-management/cvs/default.nix index 273433298fa..2879b688c6a 100644 --- a/pkgs/applications/version-management/cvs/default.nix +++ b/pkgs/applications/version-management/cvs/default.nix @@ -28,14 +28,23 @@ stdenv.mkDerivation { done ''; - buildInputs = [ nano ]; + configureFlags = [ + "--with-editor=${nano}/bin/nano" + + # Required for cross-compilation. + "cvs_cv_func_printf_ptr=yes" + ]; + + makeFlags = [ + "AR=${stdenv.cc.targetPrefix}ar" + ]; doCheck = false; # fails 1 of 1 tests meta = with lib; { homepage = "http://cvs.nongnu.org"; description = "Concurrent Versions System - a source control system"; - license = licenses.gpl2; # library is GPLv2, main is GPLv1 + license = licenses.gpl2Plus; # library is GPLv2, main is GPLv1 platforms = platforms.all; }; }