diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2016-09-01 12:02:42 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2016-09-01 12:03:10 +0200 |
| commit | 684f08166c8c80f824cdf8ea428b48dab74b87e2 (patch) | |
| tree | dd303d68f51b83f2598311c606fd800ee68048ab | |
| parent | ae2800378fe856edd5eed2a04407234779e81006 (diff) | |
| download | nixlib-684f08166c8c80f824cdf8ea428b48dab74b87e2.tar nixlib-684f08166c8c80f824cdf8ea428b48dab74b87e2.tar.gz nixlib-684f08166c8c80f824cdf8ea428b48dab74b87e2.tar.bz2 nixlib-684f08166c8c80f824cdf8ea428b48dab74b87e2.tar.lz nixlib-684f08166c8c80f824cdf8ea428b48dab74b87e2.tar.xz nixlib-684f08166c8c80f824cdf8ea428b48dab74b87e2.tar.zst nixlib-684f08166c8c80f824cdf8ea428b48dab74b87e2.zip | |
fixup
| -rw-r--r-- | pkgs/applications/science/biology/neuron/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix index 71abe614a0c2..b7616e7e7637 100644 --- a/pkgs/applications/science/biology/neuron/default.nix +++ b/pkgs/applications/science/biology/neuron/default.nix @@ -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"]); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa60859f251d..f327d17601c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5aee075b913f..574cff47122a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -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 { }; |