Skip to content
Snippets Groups Projects
Commit dd6675cc authored by Virgile Prevosto's avatar Virgile Prevosto
Browse files

[nix] allow using external sources for opam2nix packages

parent e7aad187
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 2 deletions
nix/default.nix
+ 3
− 2
View file @ dd6675cc
...@@ -2,8 +2,9 @@ ...@@ -2,8 +2,9 @@
{ pkgs, stdenv, src ? ../., opam2nix, ocaml ? pkgs.ocaml-ng.ocamlPackages_4_08.ocaml, plugins ? { } }: { pkgs, stdenv, src ? ../., opam2nix, ocaml ? pkgs.ocaml-ng.ocamlPackages_4_08.ocaml, plugins ? { } }:
let mydir = builtins.getEnv("PWD"); let mydir = builtins.getEnv("PWD");
mk-opam-selection = name: { mk-opam-selection = { name, opamSrc?null, ... }: {
inherit ocaml; inherit ocaml;
src = opamSrc;
selection = "${mydir}/${name}-${ocaml.version}-opam-selection.nix"; selection = "${mydir}/${name}-${ocaml.version}-opam-selection.nix";
}; };
opamPackages = opamPackages =
...@@ -22,7 +23,7 @@ let mydir = builtins.getEnv("PWD"); ...@@ -22,7 +23,7 @@ let mydir = builtins.getEnv("PWD");
opamPackages ++ args.opamPackages opamPackages ++ args.opamPackages
else opamPackages else opamPackages
; ;
opam-selection = mk-opam-selection args.name; opam-selection = mk-opam-selection args;
buildInputs = args.buildInputs ++ opam2nix.buildInputs opam-selection; buildInputs = args.buildInputs ++ opam2nix.buildInputs opam-selection;
in in
stdenv.mkDerivation ( stdenv.mkDerivation (
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment