This commit is contained in:
Frederik Rietdijk 2016-09-01 12:02:42 +02:00
parent ae2800378f
commit 684f08166c
3 changed files with 6 additions and 6 deletions

@ -35,8 +35,8 @@ stdenv.mkDerivation rec {
export prefix="''${prefix} --exec-prefix=''${out}"
'';
configureFlags = with stdenv.lib;
[ "--without-x" "--with-readline=${readline}" ]
configureFlags = with stdenv.lib;
[ "--without-x" "--with-readline=${readline}" ]
++ optionals (python != null) [ "--with-nrnpython=${python.interpreter}" ]
++ (if mpi != null then ["--with-mpi" "--with-paranrn"]
else ["--without-mpi"]);

@ -16455,8 +16455,8 @@ in
igv = callPackage ../applications/science/biology/igv { };
neuron = callPackage ../applications/science/biology/neuron {
python = null;
neuron = callPackage ../applications/science/biology/neuron {
python = null;
};
neuron-mpi = appendToName "mpi" (neuron.override {

@ -242,11 +242,11 @@ in modules // {
};
neuron = pkgs.neuron.override {
inherit python;
inherit python;
};
neuron-mpi = pkgs.neuron-mpi.override {
inherit python;
inherit python;
};
nixpart = callPackage ../tools/filesystems/nixpart { };