diff options
author | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-15 20:21:58 +0700 |
---|---|---|
committer | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-16 17:58:11 +0700 |
commit | badf51221db8fae81bf9948c39eaf8342dfd5597 (patch) | |
tree | 34eeb35ca97f0b081da465e9ddd6c120a9d2b7df /pkgs/desktops/gnome-2/platform | |
parent | a9bb54359eeedf2594fdf191de5b673fd1dd102d (diff) |
treewide: stdenv.lib -> lib
Diffstat (limited to 'pkgs/desktops/gnome-2/platform')
-rw-r--r-- | pkgs/desktops/gnome-2/platform/GConf/default.nix | 6 | ||||
-rw-r--r-- | pkgs/desktops/gnome-2/platform/libglade/default.nix | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix index 0e622a38e5259..bf4bd9fb68dfe 100644 --- a/pkgs/desktops/gnome-2/platform/GConf/default.nix +++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix @@ -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 diff --git a/pkgs/desktops/gnome-2/platform/libglade/default.nix b/pkgs/desktops/gnome-2/platform/libglade/default.nix index aa7e3b938c8b2..befa237dfd54f 100644 --- a/pkgs/desktops/gnome-2/platform/libglade/default.nix +++ b/pkgs/desktops/gnome-2/platform/libglade/default.nix @@ -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"; |