diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-05-13 12:02:03 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-13 12:02:03 +0000 |
| commit | 814126147f7b81aae66686f273e823b194d56808 (patch) | |
| tree | 4c70f27685b77db02a72c0d8ac1d99e68bbfe716 /pkgs/applications/science/logic | |
| parent | 9457a82e421c1644243da56cc1f9703e269213f1 (diff) | |
| parent | 477cc9463d2916d8f036346817daea3bf5ef4816 (diff) | |
| download | nixpkgs-814126147f7b81aae66686f273e823b194d56808.tar nixpkgs-814126147f7b81aae66686f273e823b194d56808.tar.gz nixpkgs-814126147f7b81aae66686f273e823b194d56808.tar.bz2 nixpkgs-814126147f7b81aae66686f273e823b194d56808.tar.lz nixpkgs-814126147f7b81aae66686f273e823b194d56808.tar.xz nixpkgs-814126147f7b81aae66686f273e823b194d56808.tar.zst nixpkgs-814126147f7b81aae66686f273e823b194d56808.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/science/logic')
| -rw-r--r-- | pkgs/applications/science/logic/coq/default.nix | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 49b3130a4d9..c078287b85e 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -70,10 +70,9 @@ let { case = range "8.7" "8.10"; out = ocamlPackages_4_09; } { case = range "8.5" "8.6"; out = ocamlPackages_4_05; } ] ocamlPackages_4_12; - ocamlNativeBuildInputs = [ ocamlPackages.ocaml ] + ocamlNativeBuildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib ] ++ optional (coqAtLeast "8.14") ocamlPackages.dune_2; - ocamlPropagatedNativeBuildInputs = [ ocamlPackages.findlib ]; - ocamlPropagatedBuildInputs = [ ] + ocamlBuildInputs = [] ++ 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: '' @@ -138,16 +136,13 @@ self = stdenv.mkDerivation { ++ optional buildIde copyDesktopItems ++ optional (buildIde && coqAtLeast "8.10") wrapGAppsHook ++ optional (!coqAtLeast "8.6") gnumake42; - buildInputs = [ ncurses ] + buildInputs = [ ncurses ] ++ ocamlBuildInputs ++ optionals buildIde (if coqAtLeast "8.10" then [ ocamlPackages.lablgtk3-sourceview3 glib gnome.adwaita-icon-theme ] else [ ocamlPackages.lablgtk ]) ; - propagatedNativeBuildInputs = ocamlPropagatedNativeBuildInputs; - propagatedBuildInputs = ocamlPropagatedBuildInputs; - postPatch = '' UNAME=$(type -tp uname) RM=$(type -tp rm) |