diff options
author | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-22 00:00:13 +0700 |
---|---|---|
committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2021-01-21 19:11:02 -0800 |
commit | 66e44425c6dfecbea68a5d6dc221ccd56561d4f1 (patch) | |
tree | 0a5bf7d41356ad47b4e6f0a737bf16c9a4a5b01e /pkgs/development/libraries/dconf | |
parent | 046d24424ef32cca1227519f93f41b5ec8133f31 (diff) | |
download | nixpkgs-66e44425c6dfecbea68a5d6dc221ccd56561d4f1.tar nixpkgs-66e44425c6dfecbea68a5d6dc221ccd56561d4f1.tar.gz nixpkgs-66e44425c6dfecbea68a5d6dc221ccd56561d4f1.tar.bz2 nixpkgs-66e44425c6dfecbea68a5d6dc221ccd56561d4f1.tar.lz nixpkgs-66e44425c6dfecbea68a5d6dc221ccd56561d4f1.tar.xz nixpkgs-66e44425c6dfecbea68a5d6dc221ccd56561d4f1.tar.zst nixpkgs-66e44425c6dfecbea68a5d6dc221ccd56561d4f1.zip |
pkgs/development/libraries: stdenv.lib -> lib
Diffstat (limited to 'pkgs/development/libraries/dconf')
-rw-r--r-- | pkgs/development/libraries/dconf/default.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/libraries/dconf/default.nix b/pkgs/development/libraries/dconf/default.nix index 4b574a17f78..6834a605f1a 100644 --- a/pkgs/development/libraries/dconf/default.nix +++ b/pkgs/development/libraries/dconf/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , meson , ninja @@ -22,10 +22,10 @@ stdenv.mkDerivation rec { version = "0.38.0"; outputs = [ "out" "lib" "dev" ] - ++ stdenv.lib.optional (!isCross) "devdoc"; + ++ lib.optional (!isCross) "devdoc"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0n2gqkp6d61h7gnnp2xnxp6w5wcl7w9ay58krrf729qd6d0hzxj5"; }; @@ -38,19 +38,19 @@ stdenv.mkDerivation rec { glib docbook-xsl-nons docbook_xml_dtd_42 - ] ++ stdenv.lib.optional (!isCross) gtk-doc; + ] ++ lib.optional (!isCross) gtk-doc; buildInputs = [ glib bash-completion dbus - ] ++ stdenv.lib.optional (!isCross) vala; + ] ++ lib.optional (!isCross) vala; # Vala cross compilation is broken. For now, build dconf without vapi when cross-compiling. mesonFlags = [ "--sysconfdir=/etc" - "-Dgtk_doc=${stdenv.lib.boolToString (!isCross)}" # gtk-doc does do some gobject introspection, which doesn't yet cross-compile. - ] ++ stdenv.lib.optional isCross "-Dvapi=false"; + "-Dgtk_doc=${lib.boolToString (!isCross)}" # gtk-doc does do some gobject introspection, which doesn't yet cross-compile. + ] ++ lib.optional isCross "-Dvapi=false"; doCheck = !stdenv.isAarch32 && !stdenv.isAarch64 && !stdenv.isDarwin; @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Projects/dconf"; license = licenses.lgpl21Plus; platforms = platforms.unix; |