From 415c38f9fe497b90c9ca53fce0c0599ea71d05ea Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Thu, 6 Sep 2018 08:28:51 +1000 Subject: renamed and fixed depends --- conda.nix | 4 ++-- test.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conda.nix b/conda.nix index daffc8e..bbcb7cf 100644 --- a/conda.nix +++ b/conda.nix @@ -3,7 +3,7 @@ { buildCondaEnv = { depends ? [], run }: stdenv.mkDerivation { name = "conda-env"; - buildInputs = [ conda ] ++ depends; + propagatedBuildInputs = [ conda ] ++ depends; buildCommand = '' mkdir $out HOME=$out @@ -14,7 +14,7 @@ ''; }; - withCondaEnv = env: run: stdenv.mkDerivation { + inCondaEnv = env: run: stdenv.mkDerivation { name = "with-conda-env"; buildCommand = '' #!${stdenv.shell} diff --git a/test.nix b/test.nix index dd5ce75..c59f786 100644 --- a/test.nix +++ b/test.nix @@ -71,7 +71,7 @@ let ''; }; - condaTest = conda.withCondaEnv condaEnv "bwa"; + condaTest = conda.inCondaEnv condaEnv "bwa"; in condaTest -- cgit v1.2.3