git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #118930 from alyssais/cvs

cvs: fix cross; clarify license

commit380f281978e85af97bab01c2e220d1a47aa1e62c authorSandro <sandro.jaeckel@gmail.com> dateTue 13 Apr 2021, 01:53 (6 years ago) parentb05908625628c6
1 file changed+11−2
pkgs/applications/version-management/cvs/default.nix+11−2
pkgs/applications/version-management/cvs/default.nix+11−2
@@ -28,14 +28,23 @@ stdenv.mkDerivation {
2828 done
2929 '';
3030
31− buildInputs = [ nano ];
31+ configureFlags = [
32+ "--with-editor=${nano}/bin/nano"
33+
34+ # Required for cross-compilation.
35+ "cvs_cv_func_printf_ptr=yes"
36+ ];
37+
38+ makeFlags = [
39+ "AR=${stdenv.cc.targetPrefix}ar"
40+ ];
3241
3342 doCheck = false; # fails 1 of 1 tests
3443
3544 meta = with lib; {
3645 homepage = "http://cvs.nongnu.org";
3746 description = "Concurrent Versions System - a source control system";
38− license = licenses.gpl2; # library is GPLv2, main is GPLv1
47+ license = licenses.gpl2Plus; # library is GPLv2, main is GPLv1
3948 platforms = platforms.all;
4049 };
4150}