From 81384e0f0c89c1fa04ede7cd09daf4e08071d31d Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Wed, 20 Nov 2019 14:32:19 +0300 Subject: [PATCH] ocaml: num: add ability to link statically --- pkgs/development/ocaml-modules/num/default.nix | 5 ++--- pkgs/development/ocaml-modules/ppx_tools/default.nix | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/num/default.nix b/pkgs/development/ocaml-modules/num/default.nix index d278a17f8d5..022b7af9629 100644 --- a/pkgs/development/ocaml-modules/num/default.nix +++ b/pkgs/development/ocaml-modules/num/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, ocaml, findlib, withStatic ? false }: stdenv.mkDerivation rec { version = "1.1"; @@ -14,8 +14,7 @@ stdenv.mkDerivation rec { url = "https://github.com/ocaml/num/commit/6d4c6d476c061298e6385e8a0864f083194b9307.patch"; sha256 = "18zlvb5n327q8y3c52js5dvyy29ssld1l53jqng8m9w1k24ypi0b"; }) - ./enable-static.patch - ]; + ] ++ lib.optional withStatic ./enable-static.patch; nativeBuildInputs = [ ocaml findlib ]; buildInputs = [ ocaml findlib ]; diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix index dab8149ccfa..984906342bc 100644 --- a/pkgs/development/ocaml-modules/ppx_tools/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix @@ -38,7 +38,7 @@ in }; nativeBuildInputs = [ ocaml findlib ]; - buildInputs = [ findlib ]; + buildInputs = [ ocaml findlib ]; createFindlibDestdir = true;