pkgs/development/libraries: stdenv.lib -> lib
This commit is contained in:
committed by
Jonathan Ringer
parent
046d24424e
commit
66e44425c6
@@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchurl, cmake, coreutils, python, root }:
|
||||
{ lib, stdenv, fetchurl, cmake, coreutils, python, root }:
|
||||
|
||||
let
|
||||
pythonVersion = with stdenv.lib.versions; "${major python.version}${minor python.version}";
|
||||
pythonVersion = with lib.versions; "${major python.version}${minor python.version}";
|
||||
withPython = python != null;
|
||||
# ensure that root is built with the same python interpreter, as it links against numpy
|
||||
root_py = if withPython then root.override { inherit python; } else root;
|
||||
@@ -18,11 +18,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ root_py ]
|
||||
++ stdenv.lib.optional withPython python;
|
||||
++ lib.optional withPython python;
|
||||
|
||||
cmakeFlags = [
|
||||
"-DHEPMC3_ENABLE_PYTHON=${if withPython then "ON" else "OFF"}"
|
||||
] ++ stdenv.lib.optionals withPython [
|
||||
] ++ lib.optionals withPython [
|
||||
"-DHEPMC3_PYTHON_VERSIONS=${if python.isPy3k then "3.X" else "2.X"}"
|
||||
"-DHEPMC3_Python_SITEARCH${pythonVersion}=${placeholder "out"}/${python.sitePackages}"
|
||||
];
|
||||
@@ -35,11 +35,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
doInstallCheck = withPython;
|
||||
# prevent nix from trying to dereference a null python
|
||||
installCheckPhase = stdenv.lib.optionalString withPython ''
|
||||
installCheckPhase = lib.optionalString withPython ''
|
||||
PYTHONPATH=${placeholder "out"}/${python.sitePackages} python -c 'import pyHepMC3'
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "The HepMC package is an object oriented, C++ event record for High Energy Physics Monte Carlo generators and simulation";
|
||||
license = licenses.gpl3;
|
||||
homepage = "http://hepmc.web.cern.ch/hepmc/";
|
||||
|
||||
Reference in New Issue
Block a user