dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

yoda: refactor root support to be more explicit

Browse Source
This commit is contained in:
Dmitry Kalinkin 2017-04-03 03:48:22 -04:00
parent 23f7087dc5
commit a07d334bf4
No known key found for this signature in database
GPG Key ID: 5157B3EC8B2CA333
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/physics/yoda/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, python2Packages, root, makeWrapper }:
{ stdenv, fetchurl, python2Packages, root, makeWrapper, withRootSupport ? false }:
stdenv.mkDerivation rec {
name = "yoda-${version}";
@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
pythonPath = []; # python wrapper support
buildInputs = with python2Packages; [ python numpy matplotlib root makeWrapper ];
buildInputs = with python2Packages; [ python numpy matplotlib makeWrapper ]
++ stdenv.lib.optional withRootSupport root;
enableParallelBuilding = true;

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

@ -17698,10 +17698,10 @@ with pkgs;
thepeg = callPackage ../development/libraries/physics/thepeg { };
yoda = callPackage ../development/libraries/physics/yoda {
root = null;
};
yoda-with-root = lowPrio (callPackage ../development/libraries/physics/yoda { });
yoda = callPackage ../development/libraries/physics/yoda { };
yoda-with-root = lowPrio (callPackage ../development/libraries/physics/yoda {
withRootSupport = true;
});
### MISC