treewide: stdenv.lib -> lib
This commit is contained in:
@@ -1,10 +1,10 @@
|
||||
{ stdenv, fetchurl, ocamlPackages, gnome2, pkgconfig, makeWrapper, glib
|
||||
{ lib, stdenv, fetchurl, ocamlPackages, gnome2, pkgconfig, makeWrapper, glib
|
||||
, libtool, libpng, yacc, expat, fontconfig, gd, pango, libjpeg, libwebp, xlibsWrapper, libXaw
|
||||
}:
|
||||
# We need an old version of Graphviz for format compatibility reasons.
|
||||
# This version is vulnerable, but monotone-viz will never feed it bad input.
|
||||
let graphviz_2_0 = import ./graphviz-2.0.nix {
|
||||
inherit stdenv fetchurl pkgconfig xlibsWrapper libpng libjpeg expat libXaw
|
||||
inherit lib stdenv fetchurl pkgconfig xlibsWrapper libpng libjpeg expat libXaw
|
||||
yacc libtool fontconfig pango gd libwebp;
|
||||
}; in
|
||||
let inherit (gnome2) libgnomecanvas; in
|
||||
@@ -48,8 +48,8 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
inherit version;
|
||||
description = ''Monotone ancestry visualiser'';
|
||||
license = stdenv.lib.licenses.gpl2Plus ;
|
||||
maintainers = [stdenv.lib.maintainers.raskin];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
license = lib.licenses.gpl2Plus ;
|
||||
maintainers = [lib.maintainers.raskin];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, pkgconfig, xlibsWrapper, libpng, libjpeg, expat, libXaw
|
||||
{ lib, stdenv, fetchurl, pkgconfig, xlibsWrapper, libpng, libjpeg, expat, libXaw
|
||||
, yacc, libtool, fontconfig, pango, gd, libwebp
|
||||
}:
|
||||
|
||||
@@ -30,12 +30,12 @@ stdenv.mkDerivation rec {
|
||||
"--with-ltdl-include=${libtool}/include"
|
||||
"--with-ltdl-lib=${libtool.lib}/lib"
|
||||
]
|
||||
++ stdenv.lib.optional (xlibsWrapper == null) "--without-x";
|
||||
++ lib.optional (xlibsWrapper == null) "--without-x";
|
||||
|
||||
meta = {
|
||||
description = "A program for visualising graphs";
|
||||
homepage = "http://www.graphviz.org/";
|
||||
branch = "2.0";
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user