diff options
| author | Orivej Desh <orivej@gmx.fr> | 2017-12-15 17:35:35 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-15 17:35:35 +0000 |
| commit | e7d4784a6ed0590a1f1970e2e89bce48d8f00a13 (patch) | |
| tree | db994a5b8b8564e28757775bc882504962a796d3 /pkgs/applications/networking | |
| parent | 3ddca57dd3d0c008242ccf11d1b5611661f4cf14 (diff) | |
| parent | 6328c97a7b800e55fd332f0c196c42ecdd2ecd44 (diff) | |
| download | nixlib-e7d4784a6ed0590a1f1970e2e89bce48d8f00a13.tar nixlib-e7d4784a6ed0590a1f1970e2e89bce48d8f00a13.tar.gz nixlib-e7d4784a6ed0590a1f1970e2e89bce48d8f00a13.tar.bz2 nixlib-e7d4784a6ed0590a1f1970e2e89bce48d8f00a13.tar.lz nixlib-e7d4784a6ed0590a1f1970e2e89bce48d8f00a13.tar.xz nixlib-e7d4784a6ed0590a1f1970e2e89bce48d8f00a13.tar.zst nixlib-e7d4784a6ed0590a1f1970e2e89bce48d8f00a13.zip | |
Merge pull request #32680 from vbgl/ocaml-topkg-cleanup
ocamlPackages.topkg: refactoring
Diffstat (limited to 'pkgs/applications/networking')
| -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 6545b90980e3..9f9236244ae2 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; |