diff options
| author | Kevin Cox <kevincox@kevincox.ca> | 2016-02-12 08:26:46 -0500 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-02-25 08:52:05 +0100 |
| commit | eead3bc5365522720e0162b403895497c8817cd6 (patch) | |
| tree | ffe6bb3d49d7bc4fe6e3feadb316ab22e15c36d5 /pkgs/top-level/all-packages.nix | |
| parent | 30b7bd8d01afb566bf7b7f140b17a3a3d99303ed (diff) | |
| download | nixlib-eead3bc5365522720e0162b403895497c8817cd6.tar nixlib-eead3bc5365522720e0162b403895497c8817cd6.tar.gz nixlib-eead3bc5365522720e0162b403895497c8817cd6.tar.bz2 nixlib-eead3bc5365522720e0162b403895497c8817cd6.tar.lz nixlib-eead3bc5365522720e0162b403895497c8817cd6.tar.xz nixlib-eead3bc5365522720e0162b403895497c8817cd6.tar.zst nixlib-eead3bc5365522720e0162b403895497c8817cd6.zip | |
util-linux: create -Minimal and utillinux (full)
Close #12952. Now the full version is used by default, supporting systemd and curses.
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f6125fbdfd86..9563feeb2924 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10021,8 +10021,8 @@ let libuuid = if crossSystem != null && crossSystem.config == "i586-pc-gnu" - then (utillinux // { - crossDrv = lib.overrideDerivation utillinux.crossDrv (args: { + then (utillinuxMinimal // { + crossDrv = lib.overrideDerivation utillinuxMinimal.crossDrv (args: { # `libblkid' fails to build on GNU/Hurd. configureFlags = args.configureFlags + " --disable-libblkid --disable-mount --disable-libmount" @@ -10035,7 +10035,7 @@ let }); }) else if stdenv.isLinux - then utillinux + then utillinuxMinimal else null; light = callPackage ../os-specific/linux/light { }; @@ -10809,13 +10809,12 @@ let usermount = callPackage ../os-specific/linux/usermount { }; - utillinux = callPackage ../os-specific/linux/util-linux { + utillinux = callPackage ../os-specific/linux/util-linux { }; + + utillinuxMinimal = appendToName "minimal" (utillinux.override { ncurses = null; perl = null; - }; - - utillinuxCurses = appendToName "curses" (utillinux.override { - inherit ncurses perl; + systemd = null; }); v4l_utils = callPackage ../os-specific/linux/v4l-utils { |