cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Revert "moving findlib to propagedNativeBuildInputs"

Browse source 
This reverts commit 82440c9374.
This commit is contained in:
Vincent Laporte 2022-05-13 06:47:14 +02:00 committed by GitHub
parent 0ba57d89ca
commit 215235cce5
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/applications/science/logic/coq/default.nix
View file

@ -72,8 +72,7 @@ let
] ocamlPackages_4_12;
ocamlNativeBuildInputs = [ ocamlPackages.ocaml ]
++ optional (coqAtLeast "8.14") ocamlPackages.dune_2;
ocamlPropagatedNativeBuildInputs = [ ocamlPackages.findlib ];
ocamlPropagatedBuildInputs = [ ]
ocamlBuildInputs = [ ocamlPackages.findlib ]
++ optional (!coqAtLeast "8.10") ocamlPackages.camlp5
++ optional (!coqAtLeast "8.13") ocamlPackages.num
++ optional (coqAtLeast "8.13") ocamlPackages.zarith;
@ -83,8 +82,7 @@ self = stdenv.mkDerivation {
passthru = {
inherit coq-version;
inherit ocamlPackages ocamlNativeNuildInputs;
inherit ocamlPropagatedBuildInputs ocamlPropagatedNativeBuildInputs;
inherit ocamlPackages ocamlBuildInputs ocamlNativeBuildInputs;
# For compatibility
inherit (ocamlPackages) ocaml camlp5 findlib num ;
emacsBufferSetup = pkgs: ''
@ -145,8 +143,7 @@ self = stdenv.mkDerivation {
else [ ocamlPackages.lablgtk ])
;
propagatedNativeBuildInputs = ocamlPropagatedNativeBuildInputs;
propagatedBuildInputs = ocamlPropagatedBuildInputs;
propagatedBuildInputs = ocamlBuildInputs;
postPatch = ''
UNAME=$(type -tp uname)

2
pkgs/development/coq-modules/simple-io/default.nix
View file

@ -12,7 +12,7 @@ with lib; mkCoqDerivation {
release."1.7.0".sha256 = "sha256:1a1q9x2abx71hqvjdai3n12jxzd49mhf3nqqh3ya2ssl2lj609ci";
release."1.3.0".sha256 = "1yp7ca36jyl9kz35ghxig45x6cd0bny2bpmy058359p94wc617ax";
mlPlugin = true;
nativeBuildInputs = [ coq.ocamlPackages.cppo ];
nativeBuildInputs = coq.ocamlPackages.cppo;
propagatedBuildInputs = [ coq-ext-lib coq.ocamlPackages.ocamlbuild ];
doCheck = true;