treewide: stdenv.lib -> lib
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkgconfig, libGLU, libGL, libX11, doxygen }:
|
||||
{ lib, stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkgconfig, libGLU, libGL, libX11, doxygen }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "avogadro-1.1.1";
|
||||
@@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
description = "Molecule editor and visualizer";
|
||||
maintainers = [ ];
|
||||
platforms = stdenv.lib.platforms.mesaPlatforms;
|
||||
platforms = lib.platforms.mesaPlatforms;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, gtk2, pkg-config, fftw, file,
|
||||
{ lib, stdenv, fetchurl, gtk2, pkg-config, fftw, file,
|
||||
pythonSupport ? false, pythonPackages ? null,
|
||||
gnome2 ? null,
|
||||
openexrSupport ? true, openexr ? null,
|
||||
@@ -40,10 +40,10 @@ stdenv.mkDerivation rec {
|
||||
url = "mirror://sourceforge/gwyddion/gwyddion-${version}.tar.xz";
|
||||
sha256 = "0z83p3ifdkv5dds8s6fqqbycql1zmgppdc7ygqmm12z5zlrl9p12";
|
||||
};
|
||||
|
||||
|
||||
nativeBuildInputs = [ pkg-config file ];
|
||||
|
||||
buildInputs = with stdenv.lib;
|
||||
|
||||
buildInputs = with lib;
|
||||
[ gtk2 fftw ] ++
|
||||
optional openglSupport gnome2.gtkglext ++
|
||||
optional openexrSupport openexr ++
|
||||
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
|
||||
optional libuniqueSupport libunique ++
|
||||
optional libzipSupport libzip;
|
||||
|
||||
propagatedBuildInputs = with stdenv.lib;
|
||||
propagatedBuildInputs = with lib;
|
||||
optionals pythonSupport [ pygtk pygobject2 python gnome2.gtksourceview ];
|
||||
|
||||
# This patch corrects problems with python support, but should apply cleanly
|
||||
@@ -79,8 +79,8 @@ stdenv.mkDerivation rec {
|
||||
analysis of profilometry data or thickness maps from imaging
|
||||
spectrophotometry.
|
||||
'';
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
platforms = with stdenv.lib.platforms; linux ++ darwin;
|
||||
maintainers = [ stdenv.lib.maintainers.cge ];
|
||||
license = lib.licenses.gpl2;
|
||||
platforms = with lib.platforms; linux ++ darwin;
|
||||
maintainers = [ lib.maintainers.cge ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchurl, dpkg, makeWrapper, coreutils, gawk, gnugrep, gnused, jre }:
|
||||
{ lib, stdenv, fetchurl, dpkg, makeWrapper, coreutils, gawk, gnugrep, gnused, jre }:
|
||||
|
||||
with stdenv.lib;
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "marvin";
|
||||
|
||||
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
buildInputs = [ fftw blas lapack gfortran ]
|
||||
++ (stdenv.lib.optionals (mpi != null) [ mpi ]);
|
||||
++ (lib.optionals (mpi != null) [ mpi ]);
|
||||
|
||||
configureFlags = if (mpi != null) then [ "LD=${mpi}/bin/mpif90" ] else [ "LD=${gfortran}/bin/gfortran" ];
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
|
||||
};
|
||||
|
||||
buildInputs = [ blas lapack gfortran ]
|
||||
++ (stdenv.lib.optionals (mpi != null) [ mpi scalapack ]);
|
||||
++ (lib.optionals (mpi != null) [ mpi scalapack ]);
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user