public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

systemd: Reident the expression file

Browse Source 
The indenting is a bit weird to follow, especially at the end of the
file (right brace without indent, but the opening brace is indented by
two spaces).

No functional change and I've verified this by building it with this
change and without and both lead to the same store paths.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @fpletz, @edolstra
This commit is contained in:
aszlig 2018-03-03 00:31:30 +01:00
parent 618ac29687
commit ae7efee4fa
No known key found for this signature in database
GPG Key ID: 684089CE67EBB691
1 changed files with 173 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/os-specific/linux/systemd/default.nix
View File

@ -16,9 +16,7 @@ assert stdenv.isLinux;
let let
pythonLxmlEnv = python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]); pythonLxmlEnv = python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]);
in in stdenv.mkDerivation rec {
stdenv.mkDerivation rec {
version = "237"; version = "237";
name = "systemd-${version}"; name = "systemd-${version}";
@ -81,8 +79,7 @@ in
"-Dsysvrcnd-path=" "-Dsysvrcnd-path="
]; ];
preConfigure = preConfigure = ''
''
mesonFlagsArray+=(-Dntp-servers="0.nixos.pool.ntp.org 1.nixos.pool.ntp.org 2.nixos.pool.ntp.org 3.nixos.pool.ntp.org") mesonFlagsArray+=(-Dntp-servers="0.nixos.pool.ntp.org 1.nixos.pool.ntp.org 2.nixos.pool.ntp.org 3.nixos.pool.ntp.org")
mesonFlagsArray+=(-Ddbuspolicydir=$out/etc/dbus-1/system.d) mesonFlagsArray+=(-Ddbuspolicydir=$out/etc/dbus-1/system.d)
mesonFlagsArray+=(-Ddbussessionservicedir=$out/share/dbus-1/services) mesonFlagsArray+=(-Ddbussessionservicedir=$out/share/dbus-1/services)
@ -159,8 +156,7 @@ in
"-USYSTEMD_BINARY_PATH" "-DSYSTEMD_BINARY_PATH=\"/run/current-system/systemd/lib/systemd/systemd\"" "-USYSTEMD_BINARY_PATH" "-DSYSTEMD_BINARY_PATH=\"/run/current-system/systemd/lib/systemd/systemd\""
]; ];
postInstall = postInstall = ''
''
# sysinit.target: Don't depend on # sysinit.target: Don't depend on
# systemd-tmpfiles-setup.service. This interferes with NixOps's # systemd-tmpfiles-setup.service. This interferes with NixOps's
# send-keys feature (since sshd.service depends indirectly on # send-keys feature (since sshd.service depends indirectly on