summary refs log tree commit diff
path: root/pkgs/development/ocaml-modules
diff options
context:
space:
mode:
authorRuben Maher <ruben@maher.fyi>2018-01-06 23:09:22 +1030
committerVincent Laporte <vbgl@users.noreply.github.com>2018-01-06 13:39:22 +0100
commit8c859b4cc98720f5d9df83777cfb802e8fcaa9c8 (patch)
treed909a9f9438561c2cd935bbc3175c66e59c8cbcd /pkgs/development/ocaml-modules
parent6474e3bc837dfdd1c13f222559ad3a51198bc01b (diff)
downloadnixpkgs-8c859b4cc98720f5d9df83777cfb802e8fcaa9c8.tar
nixpkgs-8c859b4cc98720f5d9df83777cfb802e8fcaa9c8.tar.gz
nixpkgs-8c859b4cc98720f5d9df83777cfb802e8fcaa9c8.tar.bz2
nixpkgs-8c859b4cc98720f5d9df83777cfb802e8fcaa9c8.tar.lz
nixpkgs-8c859b4cc98720f5d9df83777cfb802e8fcaa9c8.tar.xz
nixpkgs-8c859b4cc98720f5d9df83777cfb802e8fcaa9c8.tar.zst
nixpkgs-8c859b4cc98720f5d9df83777cfb802e8fcaa9c8.zip
ocaml-modules/dtoa: disable hardening (strictoverflow) on darwin (#33443)
* ocaml-modules/dtoa: disable hardening (strictoverflow) on darwin

This prevents a compile-time error on macOS:

clang-4.0: error: argument unused during compilation: '-fno-strict-overflow'
  [-Werror,-Wunused-command-line-argument]

* ocaml-modules/dtoa: remove unnecessary createFindLibDestdir

* ocaml-modules/dtoa: remove ounit from build inputs
Diffstat (limited to 'pkgs/development/ocaml-modules')
-rw-r--r--pkgs/development/ocaml-modules/dtoa/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/ocaml-modules/dtoa/default.nix b/pkgs/development/ocaml-modules/dtoa/default.nix
index 47d761894d5..9b6e5626614 100644
--- a/pkgs/development/ocaml-modules/dtoa/default.nix
+++ b/pkgs/development/ocaml-modules/dtoa/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, jbuilder, ounit }:
+{ stdenv, fetchurl, ocaml, findlib, jbuilder }:
 
 assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01";
 
@@ -14,13 +14,13 @@ stdenv.mkDerivation rec {
 
   unpackCmd = "tar xjf $src";
 
-  buildInputs = [ ocaml findlib jbuilder ounit ];
+  buildInputs = [ ocaml findlib jbuilder ];
 
   buildPhase = "jbuilder build -p dtoa";
 
   inherit (jbuilder) installPhase;
 
-  createFindLibDestdir = true;
+  hardeningDisable = stdenv.lib.optional stdenv.isDarwin "strictoverflow";
 
   meta = with stdenv.lib; {
     homepage = https://github.com/flowtype/ocaml-dtoa;