diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-04-26 19:54:51 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-05-05 11:52:08 +0200 |
commit | 3b9ef2c71b275c924c4b28caf2f8a765bfc75d14 (patch) | |
tree | 0d6fcf3d6474bdb436c0af0c975efd35df8cd6cf /nixos/modules | |
parent | b7c3c25218f8807920318ceb61b70f4343e0bd91 (diff) | |
download | nixlib-3b9ef2c71b275c924c4b28caf2f8a765bfc75d14.tar nixlib-3b9ef2c71b275c924c4b28caf2f8a765bfc75d14.tar.gz nixlib-3b9ef2c71b275c924c4b28caf2f8a765bfc75d14.tar.bz2 nixlib-3b9ef2c71b275c924c4b28caf2f8a765bfc75d14.tar.lz nixlib-3b9ef2c71b275c924c4b28caf2f8a765bfc75d14.tar.xz nixlib-3b9ef2c71b275c924c4b28caf2f8a765bfc75d14.tar.zst nixlib-3b9ef2c71b275c924c4b28caf2f8a765bfc75d14.zip |
fix "libc}/lib" and similar references
Done mostly without any verification. I didn't bother with libc}/include, as the path is still correct.
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/security/apparmor-suid.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/networking/dnscrypt-proxy.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/system/nscd.nix | 10 | ||||
-rw-r--r-- | nixos/modules/services/torrent/transmission.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/x11/display-managers/lightdm.nix | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/nixos/modules/security/apparmor-suid.nix b/nixos/modules/security/apparmor-suid.nix index b89b379ae666..3da6a81158d0 100644 --- a/nixos/modules/security/apparmor-suid.nix +++ b/nixos/modules/security/apparmor-suid.nix @@ -28,7 +28,7 @@ with lib; capability setuid, network inet raw, - ${pkgs.glibc}/lib/*.so mr, + ${pkgs.glibc.out}/lib/*.so mr, ${pkgs.libcap}/lib/libcap.so* mr, ${pkgs.attr}/lib/libattr.so* mr, diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix index 5cc33f35adb2..1200ea291aaf 100644 --- a/nixos/modules/services/networking/dnscrypt-proxy.nix +++ b/nixos/modules/services/networking/dnscrypt-proxy.nix @@ -104,7 +104,7 @@ in /dev/null rw, /dev/urandom r, - ${pkgs.glibc}/lib/*.so mr, + ${pkgs.glibc.out}/lib/*.so mr, ${pkgs.tzdata}/share/zoneinfo/** r, ${dnscrypt-proxy}/share/dnscrypt-proxy/** r, diff --git a/nixos/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix index caedc2e42173..59ba12bcc175 100644 --- a/nixos/modules/services/system/nscd.nix +++ b/nixos/modules/services/system/nscd.nix @@ -61,14 +61,14 @@ in restartTriggers = [ config.environment.etc.hosts.source config.environment.etc."nsswitch.conf".source ]; serviceConfig = - { ExecStart = "@${pkgs.glibc}/sbin/nscd nscd -f ${cfgFile}"; + { ExecStart = "@${pkgs.glibc.bin}/sbin/nscd nscd -f ${cfgFile}"; Type = "forking"; PIDFile = "/run/nscd/nscd.pid"; Restart = "always"; ExecReload = - [ "${pkgs.glibc}/sbin/nscd --invalidate passwd" - "${pkgs.glibc}/sbin/nscd --invalidate group" - "${pkgs.glibc}/sbin/nscd --invalidate hosts" + [ "${pkgs.glibc.bin}/sbin/nscd --invalidate passwd" + "${pkgs.glibc.bin}/sbin/nscd --invalidate group" + "${pkgs.glibc.bin}/sbin/nscd --invalidate hosts" ]; }; @@ -76,7 +76,7 @@ in # its pid. So wait until it's ready. postStart = '' - while ! ${pkgs.glibc}/sbin/nscd -g -f ${cfgFile} > /dev/null; do + while ! ${pkgs.glibc.bin}/sbin/nscd -g -f ${cfgFile} > /dev/null; do sleep 0.2 done ''; diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index 135113b3ceb1..3e1e0bcc1df2 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -113,7 +113,7 @@ in #include <abstractions/base> #include <abstractions/nameservice> - ${pkgs.glibc}/lib/*.so mr, + ${pkgs.glibc.out}/lib/*.so mr, ${pkgs.libevent}/lib/libevent*.so* mr, ${pkgs.curl}/lib/libcurl*.so* mr, ${pkgs.openssl}/lib/libssl*.so* mr, diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 4aeaed8cd324..8c6c678ed19a 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -32,7 +32,7 @@ let # This wrapper ensures that we actually get themes makeWrapper ${pkgs.lightdm_gtk_greeter}/sbin/lightdm-gtk-greeter \ $out/greeter \ - --prefix PATH : "${pkgs.glibc}/bin" \ + --prefix PATH : "${pkgs.glibc.bin}/bin" \ --set GDK_PIXBUF_MODULE_FILE "$(find ${theme} -name loaders.cache)" \ --set GTK_PATH "${theme}:${pkgs.gtk3}" \ --set GTK_EXE_PREFIX "${theme}" \ |