From dd6675cc29896a95f4f797a1c3f34e6bff34eda8 Mon Sep 17 00:00:00 2001
From: Virgile Prevosto <virgile.prevosto@m4x.org>
Date: Tue, 11 May 2021 11:28:40 +0200
Subject: [PATCH] [nix] allow using external sources for opam2nix packages
---
nix/default.nix | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/nix/default.nix b/nix/default.nix
index 1f9c5574107..3cc1304cb73 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -2,8 +2,9 @@
{ pkgs, stdenv, src ? ../., opam2nix, ocaml ? pkgs.ocaml-ng.ocamlPackages_4_08.ocaml, plugins ? { } }:
let mydir = builtins.getEnv("PWD");
- mk-opam-selection = name: {
+ mk-opam-selection = { name, opamSrc?null, ... }: {
inherit ocaml;
+ src = opamSrc;
selection = "${mydir}/${name}-${ocaml.version}-opam-selection.nix";
};
opamPackages =
@@ -22,7 +23,7 @@ let mydir = builtins.getEnv("PWD");
opamPackages ++ args.opamPackages
else opamPackages
;
- opam-selection = mk-opam-selection args.name;
+ opam-selection = mk-opam-selection args;
buildInputs = args.buildInputs ++ opam2nix.buildInputs opam-selection;
in
stdenv.mkDerivation (
--
GitLab