aboutsummaryrefslogtreecommitdiff
path: root/pkgs/development/libraries/glib
diff options
context:
space:
mode:
authorGraham Christensen <graham@grahamc.com>2020-11-24 10:29:28 -0500
committerGraham Christensen <graham@grahamc.com>2020-11-24 12:42:06 -0500
commitbc49a0815ae860010b4d593b02f00ab6f07d50ea (patch)
tree1435af86f0f2172632621a400f27a44599751f17 /pkgs/development/libraries/glib
parent79086e5d55e037b994c839c2894a3667ae72547b (diff)
utillinux: rename to util-linux
Diffstat (limited to 'pkgs/development/libraries/glib')
-rw-r--r--pkgs/development/libraries/glib/default.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index de874a798b2b..072a12410f48 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -1,7 +1,7 @@
{ config, stdenv, fetchurl, gettext, meson, ninja, pkgconfig, perl, python3
, libiconv, zlib, libffi, pcre, libelf, gnome3, libselinux, bash, gnum4, gtk-doc, docbook_xsl, docbook_xml_dtd_45
-# use utillinuxMinimal to avoid circular dependency (utillinux, systemd, glib)
-, utillinuxMinimal ? null
+# use util-linuxMinimal to avoid circular dependency (util-linux, systemd, glib)
+, util-linuxMinimal ? null
, buildPackages
# this is just for tests (not in the closure of any regular package)
@@ -13,7 +13,7 @@
with stdenv.lib;
-assert stdenv.isLinux -> utillinuxMinimal != null;
+assert stdenv.isLinux -> util-linuxMinimal != null;
# TODO:
# * Make it build without python
@@ -94,7 +94,7 @@ stdenv.mkDerivation rec {
bash gnum4 # install glib-gettextize and m4 macros for other apps to use
] ++ optionals stdenv.isLinux [
libselinux
- utillinuxMinimal # for libmount
+ util-linuxMinimal # for libmount
] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
AppKit Carbon Cocoa CoreFoundation CoreServices Foundation
]);