diff options
author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-12-14 07:36:29 +0000 |
---|---|---|
committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-12-14 07:36:29 +0000 |
commit | 5e4edcc4ec175d0b4ed8f210de9a2e003e3926cb (patch) | |
tree | 60dadc8764c40750a93ebd1c0b04d8b39251d5eb /pkgs/applications/networking/instant-messengers/jackline/default.nix | |
parent | 9b6ef35b2c848702582a1a7574ab12e70cd4749a (diff) |
ocamlPackages.topkg: refactoring
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/jackline/default.nix')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/jackline/default.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix index 6545b90980e32..9f9236244ae2d 100644 --- a/pkgs/applications/networking/instant-messengers/jackline/default.nix +++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, ocamlPackages, opam}: +{ stdenv, fetchFromGitHub, ocamlPackages }: assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.02.2"; @@ -16,13 +16,12 @@ stdenv.mkDerivation rec { buildInputs = with ocamlPackages; [ ocaml ocamlbuild findlib topkg ppx_sexp_conv erm_xmpp_0_3 tls nocrypto x509 ocaml_lwt otr astring - ptime notty sexplib_p4 hex uutf opam + ptime notty sexplib_p4 hex uutf ]; - buildPhase = with ocamlPackages; - "ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib pkg/pkg.ml build --pinned true"; + buildPhase = "${ocamlPackages.topkg.run} build --pinned true"; - installPhase = "opam-installer --prefix=$out --script | sh"; + inherit (ocamlPackages.topkg) installPhase; meta = with stdenv.lib; { homepage = https://github.com/hannesm/jackline; |