diff options
author | Benjamin Barenblat <bbaren@debian.org> | 2019-02-02 19:29:23 -0500 |
---|---|---|
committer | Benjamin Barenblat <bbaren@debian.org> | 2019-02-02 19:29:23 -0500 |
commit | 9ebf44d84754adc5b64fcf612c6816c02c80462d (patch) | |
tree | bf5e06a28488e0e06a2f2011ff0d110e2e02f8fc /default.nix | |
parent | 9043add656177eeac1491a73d2f3ab92bec0013c (diff) |
Imported Upstream version 8.9.0upstream/8.9.0upstream
Diffstat (limited to 'default.nix')
-rw-r--r-- | default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/default.nix b/default.nix index a64d8120..12ab470d 100644 --- a/default.nix +++ b/default.nix @@ -61,8 +61,9 @@ stdenv.mkDerivation rec { optional (!versionAtLeast ocaml.version "4.07") ncurses ++ [ ocamlPackages.ounit rsync which ] ) - ++ optionals shell (with ocamlPackages; - [ merlin ocp-indent ocp-index ] # Dev tools + ++ optionals shell ( + [ jq curl git gnupg ] # Dependencies of the merging script + ++ (with ocamlPackages; [ merlin ocp-indent ocp-index ]) # Dev tools ); src = @@ -74,14 +75,15 @@ stdenv.mkDerivation rec { prefixKey = "-prefix "; - buildFlags = [ "world" "byte" ] ++ optional buildDoc "sphinx"; + buildFlags = [ "world" "byte" ] ++ optional buildDoc "doc-html"; installTargets = - [ "install" "install-byte" ] ++ optional buildDoc "install-doc-sphinx"; + [ "install" "install-byte" ] ++ optional buildDoc "install-doc-html"; inherit doInstallCheck; preInstallCheck = '' + patchShebangs dev/tools/ patchShebangs tools/ patchShebangs test-suite/ ''; |