public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixup

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/science/biology/neuron/default.nix
View File

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

4
pkgs/top-level/all-packages.nix
View File

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

4
pkgs/top-level/python-packages.nix
View File

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