diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-04-11 18:08:51 +0200 |
---|---|---|
committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-04-11 18:18:53 +0200 |
commit | 3ab45f4b369c9c741b55ddedeaac4c797dc61c04 (patch) | |
tree | 3c5e330622e42066e50ab20a6c58b9251addf863 /pkgs/development/ocaml-modules | |
parent | 54fff9ec1a9e7425926eadffada0268351536926 (diff) | |
download | nixlib-3ab45f4b369c9c741b55ddedeaac4c797dc61c04.tar nixlib-3ab45f4b369c9c741b55ddedeaac4c797dc61c04.tar.gz nixlib-3ab45f4b369c9c741b55ddedeaac4c797dc61c04.tar.bz2 nixlib-3ab45f4b369c9c741b55ddedeaac4c797dc61c04.tar.lz nixlib-3ab45f4b369c9c741b55ddedeaac4c797dc61c04.tar.xz nixlib-3ab45f4b369c9c741b55ddedeaac4c797dc61c04.tar.zst nixlib-3ab45f4b369c9c741b55ddedeaac4c797dc61c04.zip |
treewide: use boolToString function
Diffstat (limited to 'pkgs/development/ocaml-modules')
-rw-r--r-- | pkgs/development/ocaml-modules/mtime/default.nix | 10 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/nocrypto/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/notty/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/vg/default.nix | 14 |
4 files changed, 16 insertions, 12 deletions
diff --git a/pkgs/development/ocaml-modules/mtime/default.nix b/pkgs/development/ocaml-modules/mtime/default.nix index a26109bd4f95..5e18d1fd6e42 100644 --- a/pkgs/development/ocaml-modules/mtime/default.nix +++ b/pkgs/development/ocaml-modules/mtime/default.nix @@ -1,7 +1,9 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, js_of_ocaml +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, opam, js_of_ocaml , jsooSupport ? !(stdenv.lib.versionAtLeast ocaml.version "4.04") }: +with lib; + stdenv.mkDerivation { name = "ocaml${ocaml.version}-mtime-0.8.3"; @@ -15,7 +17,7 @@ stdenv.mkDerivation { buildInputs = [ ocaml findlib ocamlbuild opam ] ++ stdenv.lib.optional jsooSupport js_of_ocaml; - buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true jsoo=${if jsooSupport then "true" else "false"}"; + buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true jsoo=${boolToString jsooSupport}"; installPhase = "opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR"; @@ -23,7 +25,7 @@ stdenv.mkDerivation { description = "Monotonic wall-clock time for OCaml"; homepage = http://erratique.ch/software/mtime; inherit (ocaml.meta) platforms; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - license = stdenv.lib.licenses.bsd3; + maintainers = [ maintainers.vbgl ]; + license = licenses.bsd3; }; } diff --git a/pkgs/development/ocaml-modules/nocrypto/default.nix b/pkgs/development/ocaml-modules/nocrypto/default.nix index f9240f7507cf..91ab694eb6f2 100644 --- a/pkgs/development/ocaml-modules/nocrypto/default.nix +++ b/pkgs/development/ocaml-modules/nocrypto/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildPhase = '' LD_LIBRARY_PATH=${cpuid}/lib/ocaml/${ocaml.version}/site-lib/stubslibs/ \ - ${topkg.buildPhase} --with-lwt ${if withLwt then "true" else "false"} + ${topkg.buildPhase} --with-lwt ${boolToString withLwt} ''; inherit (topkg) installPhase; diff --git a/pkgs/development/ocaml-modules/notty/default.nix b/pkgs/development/ocaml-modules/notty/default.nix index b967728d048c..950395bd7eaa 100644 --- a/pkgs/development/ocaml-modules/notty/default.nix +++ b/pkgs/development/ocaml-modules/notty/default.nix @@ -29,7 +29,7 @@ buildOcaml rec { optional withLwt lwt; buildPhase = topkg.buildPhase - + " --with-lwt ${if withLwt then "true" else "false"}"; + + " --with-lwt ${boolToString withLwt}"; inherit (topkg) installPhase; diff --git a/pkgs/development/ocaml-modules/vg/default.nix b/pkgs/development/ocaml-modules/vg/default.nix index cb7878ac731e..ba33081486d7 100644 --- a/pkgs/development/ocaml-modules/vg/default.nix +++ b/pkgs/development/ocaml-modules/vg/default.nix @@ -1,16 +1,17 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg , uchar, result, gg, uutf, otfm, js_of_ocaml, pdfBackend ? true, # depends on uutf and otfm htmlcBackend ? true # depends on js_of_ocaml }: +with lib; + let inherit (stdenv.lib) optionals versionAtLeast; pname = "vg"; version = "0.9.0"; webpage = "http://erratique.ch/software/${pname}"; - sob = b: if b then "true" else "false"; in assert versionAtLeast ocaml.version "4.02.0"; @@ -35,13 +36,14 @@ stdenv.mkDerivation rec { unpackCmd = "tar xjf $src"; buildPhase = topkg.buildPhase - + " --with-uutf ${sob pdfBackend} --with-otfm ${sob pdfBackend}" - + " --with-js_of_ocaml ${sob htmlcBackend}" - + " --with-cairo2 false"; + + " --with-uutf ${boolToString pdfBackend}" + + " --with-otfm ${boolToString pdfBackend}" + + " --with-js_of_ocaml ${boolToString htmlcBackend}" + + " --with-cairo2 false"; inherit (topkg) installPhase; - meta = with stdenv.lib; { + meta = { description = "Declarative 2D vector graphics for OCaml"; longDescription = '' Vg is an OCaml module for declarative 2D vector graphics. In Vg, images |