treewide: stdenv.lib -> lib
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, fetchurl, python2, pkgconfig, libgnome, GConf, glib, gtk2, gnome_vfs }:
|
||||
|
||||
with stdenv.lib;
|
||||
with lib;
|
||||
|
||||
let
|
||||
inherit (python2.pkgs) python pygobject2 pygtk dbus-python;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{stdenv, fetchpatch, fetchurl, autoreconfHook, pkgconfig, atk, cairo, glib
|
||||
{lib, stdenv, fetchpatch, fetchurl, autoreconfHook, pkgconfig, atk, cairo, glib
|
||||
, gnome-common, gtk2, pango
|
||||
, libxml2Python, perl, intltool, gettext, gtk-mac-integration-gtk2 }:
|
||||
|
||||
with stdenv.lib;
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gtksourceview";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, fetchpatch, intltool, pkgconfig, glib, gtk2, ncurses
|
||||
{ lib, stdenv, fetchurl, fetchpatch, intltool, pkgconfig, glib, gtk2, ncurses
|
||||
, pythonSupport ? false, python27Packages}:
|
||||
|
||||
let
|
||||
@@ -30,13 +30,13 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ intltool glib gtk2 ncurses ] ++
|
||||
stdenv.lib.optionals pythonSupport [python pygtk];
|
||||
lib.optionals pythonSupport [python pygtk];
|
||||
|
||||
configureFlags = [
|
||||
(stdenv.lib.enableFeature pythonSupport "python")
|
||||
(lib.enableFeature pythonSupport "python")
|
||||
];
|
||||
|
||||
postInstall = stdenv.lib.optionalString pythonSupport ''
|
||||
postInstall = lib.optionalString pythonSupport ''
|
||||
cd $(toPythonPath $out)/gtk-2.0
|
||||
for n in *; do
|
||||
ln -s "gtk-2.0/$n" "../$n"
|
||||
@@ -54,8 +54,8 @@ in stdenv.mkDerivation rec {
|
||||
character set conversion, as well as emulating any terminal known to
|
||||
the system's terminfo database.
|
||||
'';
|
||||
license = stdenv.lib.licenses.lgpl2;
|
||||
maintainers = with stdenv.lib.maintainers; [ astsmtl ];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
license = lib.licenses.lgpl2;
|
||||
maintainers = with lib.maintainers; [ astsmtl ];
|
||||
platforms = with lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
|
||||
version = "3.2.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/GConf/${stdenv.lib.versions.majorMinor version}/GConf-${version}.tar.xz";
|
||||
url = "mirror://gnome/sources/GConf/${lib.versions.majorMinor version}/GConf-${version}.tar.xz";
|
||||
sha256 = "0k3q9nh53yhc9qxf1zaicz4sk8p3kzq4ndjdsgpaa2db0ccbj4hr";
|
||||
};
|
||||
|
||||
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ ORBit2 libxml2 python3 ]
|
||||
# polkit requires pam, which requires shadow.h, which is not available on
|
||||
# darwin
|
||||
++ stdenv.lib.optional (!stdenv.isDarwin) polkit;
|
||||
++ lib.optional (!stdenv.isDarwin) polkit;
|
||||
|
||||
propagatedBuildInputs = [ glib dbus-glib ];
|
||||
|
||||
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
configureFlags =
|
||||
# fixes the "libgconfbackend-oldxml.so is not portable" error on darwin
|
||||
stdenv.lib.optional stdenv.isDarwin [ "--enable-static" ];
|
||||
lib.optional stdenv.isDarwin [ "--enable-static" ];
|
||||
|
||||
postPatch = ''
|
||||
2to3 --write --nobackup gsettings/gsettings-schema-convert
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, pkgconfig, gtk2, libxml2, python2 ? null, withLibgladeConvert ? false, gettext }:
|
||||
{ lib, stdenv, fetchurl, pkgconfig, gtk2, libxml2, python2 ? null, withLibgladeConvert ? false, gettext }:
|
||||
|
||||
assert withLibgladeConvert -> python2 != null;
|
||||
|
||||
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ gtk2 gettext ]
|
||||
++ stdenv.lib.optional withLibgladeConvert python2;
|
||||
++ lib.optional withLibgladeConvert python2;
|
||||
|
||||
NIX_LDFLAGS = "-lgmodule-2.0";
|
||||
|
||||
|
||||
Reference in New Issue
Block a user