utillinux: rename to util-linux

This commit is contained in:
Graham Christensen
2020-11-24 10:29:28 -05:00
parent 79086e5d55
commit bc49a0815a
265 changed files with 574 additions and 571 deletions

View File

@@ -1,6 +1,6 @@
{ callPackage, gobject-introspection, cmake, pkgconfig
, glib, libsndfile, zlib, bzip2, lzma, libsamplerate, intltool
, pcre, utillinux, libselinux, libsepol }:
, pcre, util-linux, libselinux, libsepol }:
let pkg = import ./base.nix {
version = "3.2.3";
@@ -13,6 +13,6 @@ in callPackage pkg {
PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "out"}/share/gir-1.0";
PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0";
nativeBuildInputs = [ cmake gobject-introspection pkgconfig ];
propagatedBuildInputs = [ pcre utillinux libselinux libsepol ];
propagatedBuildInputs = [ pcre util-linux libselinux libsepol ];
};
}

View File

@@ -3,7 +3,7 @@
, minizip, zlib
, qtbase, qtsvg, qtmultimedia, qtwebkit, qttranslations, qtxmlpatterns
, rsync, SDL2, xwininfo
, utillinux
, util-linux
, xorg
}:
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ qttools pkgconfig ];
buildInputs = [ minizip qtbase qtsvg qtmultimedia qtwebkit
qttranslations qtxmlpatterns rsync SDL2
xwininfo zlib utillinux xorg.libxcb ];
xwininfo zlib util-linux xorg.libxcb ];
makeFlags = [ "DESTDIR=$(out)"
"PREFIX=/"

View File

@@ -8,7 +8,7 @@ let patch = (callPackage ./sources.nix {}).staging;
in assert stdenv.lib.getVersion wineUnstable == patch.version;
(stdenv.lib.overrideDerivation wineUnstable (self: {
buildInputs = build-inputs [ "perl" "utillinux" "autoconf" "gitMinimal" ] self.buildInputs;
buildInputs = build-inputs [ "perl" "util-linux" "autoconf" "gitMinimal" ] self.buildInputs;
name = "${self.name}-staging";