diff options
author | Graham Christensen <graham@grahamc.com> | 2020-11-24 10:29:28 -0500 |
---|---|---|
committer | Graham Christensen <graham@grahamc.com> | 2020-11-24 12:42:06 -0500 |
commit | bc49a0815ae860010b4d593b02f00ab6f07d50ea (patch) | |
tree | 1435af86f0f2172632621a400f27a44599751f17 /pkgs/tools/filesystems/glusterfs | |
parent | 79086e5d55e037b994c839c2894a3667ae72547b (diff) |
utillinux: rename to util-linux
Diffstat (limited to 'pkgs/tools/filesystems/glusterfs')
-rw-r--r-- | pkgs/tools/filesystems/glusterfs/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index e7028ec124943..f495b56e32523 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, fuse, bison, flex_2_5_35, openssl, python3, ncurses, readline, autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2, acl, sqlite, liburcu, attr, makeWrapper, coreutils, gnused, gnugrep, which, - openssh, gawk, findutils, utillinux, lvm2, btrfs-progs, e2fsprogs, xfsprogs, systemd, + openssh, gawk, findutils, util-linux, lvm2, btrfs-progs, e2fsprogs, xfsprogs, systemd, rsync, glibc, rpcsvc-proto, libtirpc }: let @@ -24,7 +24,7 @@ let buildInputs = [ fuse bison flex_2_5_35 openssl ncurses readline autoconf automake libtool pkgconfig zlib libaio libxml2 - acl sqlite liburcu attr makeWrapper utillinux libtirpc + acl sqlite liburcu attr makeWrapper util-linux libtirpc (python3.withPackages (pkgs: [ pkgs.flask pkgs.prettytable @@ -56,7 +56,7 @@ let openssh # ssh rsync # rsync, e.g. for geo-replication systemd # systemctl - utillinux # mount umount + util-linux # mount umount which # which xfsprogs # xfs_info ]; @@ -76,9 +76,9 @@ stdenv.mkDerivation substituteInPlace libglusterfs/src/glusterfs/lvm-defaults.h \ --replace '/sbin/' '${lvm2}/bin/' substituteInPlace libglusterfs/src/glusterfs/compat.h \ - --replace '/bin/umount' '${utillinux}/bin/umount' + --replace '/bin/umount' '${util-linux}/bin/umount' substituteInPlace contrib/fuse-lib/mount-gluster-compat.h \ - --replace '/bin/mount' '${utillinux}/bin/mount' + --replace '/bin/mount' '${util-linux}/bin/mount' ''; # Note that the VERSION file is something that is present in release tarballs |