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

nixos: try to fix, choosing correct binary outputs

Browse Source
This commit is contained in:
Vladimír Čunát 2015-05-05 11:39:28 +02:00
parent c2fff72836
commit d449020d87
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/modules/system/activation/activation-script.nix
View File

@ -12,7 +12,8 @@ let
''; '';
}); });
path = path = map # outputs TODO?
(pkg: (pkg.bin or (pkg.out or pkg)))
[ pkgs.coreutils pkgs.gnugrep pkgs.findutils [ pkgs.coreutils pkgs.gnugrep pkgs.findutils
pkgs.glibc # needed for getent pkgs.glibc # needed for getent
pkgs.shadow pkgs.shadow

2
nixos/modules/system/boot/systemd.nix
View File

@ -663,7 +663,7 @@ in
# Make all journals readable to users in the wheel and adm # Make all journals readable to users in the wheel and adm
# groups, in addition to those in the systemd-journal group. # groups, in addition to those in the systemd-journal group.
# Users can always read their own journals. # Users can always read their own journals.
${pkgs.acl}/bin/setfacl -nm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx /var/log/journal || true ${pkgs.acl.bin}/bin/setfacl -nm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx /var/log/journal || true
''; '';
# Target for ‘charon send-keys’ to hook into. # Target for ‘charon send-keys’ to hook into.