summary refs log tree commit diff
path: root/pkgs/os-specific/linux/util-linux
diff options
context:
space:
mode:
authorKevin Cox <kevincox@kevincox.ca>2016-02-12 08:26:46 -0500
committerVladimír Čunát <vcunat@gmail.com>2016-02-25 08:52:05 +0100
commiteead3bc5365522720e0162b403895497c8817cd6 (patch)
treeffe6bb3d49d7bc4fe6e3feadb316ab22e15c36d5 /pkgs/os-specific/linux/util-linux
parent30b7bd8d01afb566bf7b7f140b17a3a3d99303ed (diff)
downloadnixlib-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/os-specific/linux/util-linux')
-rw-r--r--pkgs/os-specific/linux/util-linux/default.nix9
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index bcd9aa58bccf..a84740b1a30b 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, zlib, ncurses ? null, perl ? null, pam }:
+{ stdenv, fetchurl, zlib, ncurses ? null, perl ? null, pam, systemd ? null
+, pkgconfig
+}:
 
 stdenv.mkDerivation rec {
   name = "util-linux-2.27.1";
@@ -38,11 +40,16 @@ stdenv.mkDerivation rec {
     --disable-use-tty-group
     --enable-fs-paths-default=/var/setuid-wrappers:/var/run/current-system/sw/bin:/sbin
     ${if ncurses == null then "--without-ncurses" else ""}
+    ${if systemd == null then "" else ''
+      --with-systemd
+      --with-systemdsystemunitdir=$out/lib/systemd/system/
+    ''}
   '';
 
   buildInputs =
     [ zlib pam ]
     ++ stdenv.lib.optional (ncurses != null) ncurses
+    ++ stdenv.lib.optional (systemd != null) [ systemd pkgconfig ]
     ++ stdenv.lib.optional (perl != null) perl;
 
   postInstall = ''