treewide: stdenv.lib -> lib
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, boost, hepmc2, lhapdf, pythia, makeWrapper }:
|
||||
{ lib, stdenv, fetchurl, boost, hepmc2, lhapdf, pythia, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "sacrifice";
|
||||
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
|
||||
preConfigure = ''
|
||||
substituteInPlace configure --replace HAVE_LCG=yes HAVE_LCG=no
|
||||
''
|
||||
+ stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
+ lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace configure --replace LIB_SUFFIX=\"so\" LIB_SUFFIX=\"dylib\"
|
||||
'';
|
||||
|
||||
@@ -40,9 +40,9 @@ stdenv.mkDerivation {
|
||||
|
||||
meta = {
|
||||
description = "A standalone contribution to AGILe for steering Pythia 8";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
license = lib.licenses.gpl2;
|
||||
homepage = "https://agile.hepforge.org/trac/wiki/Sacrifice";
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
maintainers = with stdenv.lib.maintainers; [ veprbl ];
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ veprbl ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
||||
#
|
||||
# gfortran: error: unrecognized command line option '-stdlib=libc++'
|
||||
#
|
||||
stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace src/Makefile.in \
|
||||
--replace "F77LD = \$(F77)" "F77LD = \$(CXXLD)" \
|
||||
'';
|
||||
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs =
|
||||
[ apfel apfelgrid applgrid blas lhapdf lapack mela root5 qcdnum libtirpc ]
|
||||
# pdf2yaml requires fmemopen and open_memstream which are not readily available on Darwin
|
||||
++ stdenv.lib.optional (!stdenv.isDarwin) libyaml
|
||||
++ lib.optional (!stdenv.isDarwin) libyaml
|
||||
;
|
||||
propagatedBuildInputs = [ lynx ];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user