jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

obliv-c: migrate to OCaml 4.14

Browse Source
This commit is contained in:
Weijia Wang 2023-03-05 01:40:37 +02:00
parent 67faa3e9b3
commit 50e35e9b6c
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/obliv-c/default.nix
View File

@ -7,6 +7,7 @@ stdenv.mkDerivation rec {
strictDeps = true;
nativeBuildInputs = [ perl ]
++ (with ocamlPackages; [ ocaml findlib ocamlbuild ]);
buildInputs = [ ocamlPackages.num ];
propagatedBuildInputs = [ libgcrypt ];
src = fetchFromGitHub {
owner = "samee";
@ -19,6 +20,9 @@ stdenv.mkDerivation rec {
patches = [ ./ignore-complex-float128.patch ];
# https://github.com/samee/obliv-c/issues/76#issuecomment-438958209
env.OCAMLBUILD = "ocamlbuild -package num -ocamlopt 'ocamlopt -dontlink num' -ocamlc 'ocamlc -dontlink num'";
preBuild = ''
patchShebangs .
'';

6
pkgs/top-level/all-packages.nix
View File

@ -15529,8 +15529,10 @@ with pkgs;
nvidia_cg_toolkit = callPackage ../development/compilers/nvidia-cg-toolkit { };
obliv-c = callPackage ../development/compilers/obliv-c
{ stdenv = gcc10StdenvCompat; ocamlPackages = ocaml-ng.ocamlPackages_4_05; };
obliv-c = callPackage ../development/compilers/obliv-c {
stdenv = gcc10StdenvCompat;
ocamlPackages = ocaml-ng.ocamlPackages_4_14;
};
ocaml-ng = callPackage ./ocaml-packages.nix { };
ocaml = ocamlPackages.ocaml;