pkgs/development/libraries: stdenv.lib -> lib
This commit is contained in:
committed by
Jonathan Ringer
parent
046d24424e
commit
66e44425c6
@@ -1,4 +1,4 @@
|
||||
{ config, stdenv, fetchurl, pkg-config, gettext, glib, atk, pango, cairo, perl, xorg
|
||||
{ config, lib, stdenv, fetchurl, pkg-config, gettext, glib, atk, pango, cairo, perl, xorg
|
||||
, gdk-pixbuf, xlibsWrapper, gobject-introspection
|
||||
, xineramaSupport ? stdenv.isLinux
|
||||
, cupsSupport ? config.gtk2.cups or stdenv.isLinux, cups ? null
|
||||
@@ -10,7 +10,7 @@
|
||||
assert xineramaSupport -> xorg.libXinerama != null;
|
||||
assert cupsSupport -> cups != null;
|
||||
|
||||
with stdenv.lib;
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gtk+";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv
|
||||
{ lib, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
@@ -48,7 +48,7 @@
|
||||
|
||||
assert cupsSupport -> cups != null;
|
||||
|
||||
with stdenv.lib;
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gtk+3";
|
||||
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz";
|
||||
url = "mirror://gnome/sources/gtk+/${lib.versions.majorMinor version}/gtk+-${version}.tar.xz";
|
||||
sha256 = "12ipk1d376bai9v820qzhxba93kkh5abi6mhyqr4hwjvqmkl77fc";
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user