mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 19:51:17 +00:00
Code Issues Wiki Activity

moving findlib to propagedNativeBuildInputs

Browse source
This commit is contained in:
Cyril Cohen 2022-05-04 23:57:52 +02:00 committed by Vincent Laporte
parent 7e589a45ef
commit 82440c9374
2 changed files with 7 additions and 4 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,7 +72,8 @@ let
] ocamlPackages_4_12;
ocamlNativeBuildInputs = [ ocamlPackages.ocaml ]
++ optional (coqAtLeast "8.14") ocamlPackages.dune_2;
ocamlBuildInputs = [ ocamlPackages.findlib ]
ocamlPropagatedNativeBuildInputs = [ ocamlPackages.findlib ];
ocamlPropagatedBuildInputs = [ ]
++ optional (!coqAtLeast "8.10") ocamlPackages.camlp5
++ optional (!coqAtLeast "8.13") ocamlPackages.num
++ optional (coqAtLeast "8.13") ocamlPackages.zarith;
@ -82,7 +83,8 @@ self = stdenv.mkDerivation {
passthru = {
inherit coq-version;
inherit ocamlPackages ocamlBuildInputs ocamlNativeBuildInputs;
inherit ocamlPackages ocamlNativeNuildInputs;
inherit ocamlPropagatedBuildInputs ocamlPropagatedNativeBuildInputs;
# For compatibility
inherit (ocamlPackages) ocaml camlp5 findlib num ;
emacsBufferSetup = pkgs: ''
@ -143,7 +145,8 @@ self = stdenv.mkDerivation {
else [ ocamlPackages.lablgtk ])
;
propagatedBuildInputs = ocamlBuildInputs;
propagatedNativeBuildInputs = ocamlPropagatedNativeBuildInputs;
propagatedBuildInputs = ocamlPropagatedBuildInputs;
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;