diff options
author | Orivej Desh <orivej@gmx.fr> | 2020-05-22 09:13:23 +0000 |
---|---|---|
committer | Orivej Desh <orivej@gmx.fr> | 2020-05-22 09:13:23 +0000 |
commit | 16d7f7edae6847e7a792d79b533b245f71907f46 (patch) | |
tree | a304b937bc072e96e2745ede17c7e6b9b4495bee /pkgs/development/ocaml-modules/cairo2/default.nix | |
parent | eae4f22176789ce3b6a66bad773a45b12e895cdf (diff) | |
parent | 5de1e307f29ab91baeb43ab2a58ed13a944e40ea (diff) | |
download | nixlib-16d7f7edae6847e7a792d79b533b245f71907f46.tar nixlib-16d7f7edae6847e7a792d79b533b245f71907f46.tar.gz nixlib-16d7f7edae6847e7a792d79b533b245f71907f46.tar.bz2 nixlib-16d7f7edae6847e7a792d79b533b245f71907f46.tar.lz nixlib-16d7f7edae6847e7a792d79b533b245f71907f46.tar.xz nixlib-16d7f7edae6847e7a792d79b533b245f71907f46.tar.zst nixlib-16d7f7edae6847e7a792d79b533b245f71907f46.zip |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/development/ocaml-modules/cairo2/default.nix')
-rw-r--r-- | pkgs/development/ocaml-modules/cairo2/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/ocaml-modules/cairo2/default.nix b/pkgs/development/ocaml-modules/cairo2/default.nix index 22d000a5fd33..bf129c7bc442 100644 --- a/pkgs/development/ocaml-modules/cairo2/default.nix +++ b/pkgs/development/ocaml-modules/cairo2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, buildDunePackage +{ stdenv, lib, fetchurl, buildDunePackage, ocaml , pkgconfig, cairo }: @@ -14,7 +14,9 @@ buildDunePackage rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cairo ]; - doCheck = !stdenv.isDarwin; + doCheck = !(stdenv.isDarwin + # https://github.com/Chris00/ocaml-cairo/issues/19 + || lib.versionAtLeast ocaml.version "4.10"); meta = { homepage = "https://github.com/Chris00/ocaml-cairo"; |