Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e'

1 files changed, 6 insertions, 6 deletions

diff --git a/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix b/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix
index 10b789f514f9..0b1b1f8fa578 100644
--- a/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix
@@ -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/";