diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-20 16:39:12 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-20 16:39:12 -0400 |
| commit | 4224b034cc9cf415517f5779c7a6fc5fda2ff635 (patch) | |
| tree | b02e5613e9936ed6cd455b641988f988887706cb /pkgs/os-specific/linux/systemd | |
| parent | d8934feba1399d220550b81dceeb6da35149cf02 (diff) | |
| download | nixlib-4224b034cc9cf415517f5779c7a6fc5fda2ff635.tar nixlib-4224b034cc9cf415517f5779c7a6fc5fda2ff635.tar.gz nixlib-4224b034cc9cf415517f5779c7a6fc5fda2ff635.tar.bz2 nixlib-4224b034cc9cf415517f5779c7a6fc5fda2ff635.tar.lz nixlib-4224b034cc9cf415517f5779c7a6fc5fda2ff635.tar.xz nixlib-4224b034cc9cf415517f5779c7a6fc5fda2ff635.tar.zst nixlib-4224b034cc9cf415517f5779c7a6fc5fda2ff635.zip | |
systemd: use lib.getBin for utillinux
it’s almost always a better idea to use getBin instead of .bin. Otherwise, we could get an evaluation error if utillinux is missing the bin otuput.
Diffstat (limited to 'pkgs/os-specific/linux/systemd')
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index d54972c055be..bc071d21ce43 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -129,12 +129,12 @@ in stdenv.mkDerivation rec { test -e $i substituteInPlace $i \ --replace /usr/bin/getent ${getent}/bin/getent \ - --replace /sbin/swapon ${utillinux.bin}/sbin/swapon \ - --replace /sbin/swapoff ${utillinux.bin}/sbin/swapoff \ - --replace /sbin/fsck ${utillinux.bin}/sbin/fsck \ + --replace /sbin/swapon ${lib.getBin utillinux}/sbin/swapon \ + --replace /sbin/swapoff ${lib.getBin utillinux}/sbin/swapoff \ + --replace /sbin/fsck ${lib.getBin utillinux}/sbin/fsck \ --replace /bin/echo ${coreutils}/bin/echo \ --replace /bin/cat ${coreutils}/bin/cat \ - --replace /sbin/sulogin ${utillinux.bin}/sbin/sulogin \ + --replace /sbin/sulogin ${lib.getBin utillinux}/sbin/sulogin \ --replace /usr/lib/systemd/systemd-fsck $out/lib/systemd/systemd-fsck \ --replace /bin/plymouth /run/current-system/sw/bin/plymouth # To avoid dependency done |