diff options
| author | Parnell Springmeyer <parnell@digitalmentat.com> | 2017-01-28 20:48:03 -0800 |
|---|---|---|
| committer | Parnell Springmeyer <parnell@digitalmentat.com> | 2017-01-28 20:48:03 -0800 |
| commit | e92b8402b05f34072a20075ed54660e7a7237cc3 (patch) | |
| tree | 554ae0ff77ff4192a895bab155e5e7116c80f28d /pkgs/os-specific/linux | |
| parent | 9de070e620544f9637b20966eec62cbff42988d8 (diff) | |
| download | nixpkgs-e92b8402b05f34072a20075ed54660e7a7237cc3.tar nixpkgs-e92b8402b05f34072a20075ed54660e7a7237cc3.tar.gz nixpkgs-e92b8402b05f34072a20075ed54660e7a7237cc3.tar.bz2 nixpkgs-e92b8402b05f34072a20075ed54660e7a7237cc3.tar.lz nixpkgs-e92b8402b05f34072a20075ed54660e7a7237cc3.tar.xz nixpkgs-e92b8402b05f34072a20075ed54660e7a7237cc3.tar.zst nixpkgs-e92b8402b05f34072a20075ed54660e7a7237cc3.zip | |
Addressing PR feedback
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/fuse/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/mdadm/4.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/mdadm/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/pam/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/util-linux/default.nix | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix index a36934004d2..29bcc58c7c0 100644 --- a/pkgs/os-specific/linux/fuse/default.nix +++ b/pkgs/os-specific/linux/fuse/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # Ensure that FUSE calls the setuid wrapper, not # $out/bin/fusermount. It falls back to calling fusermount in # $PATH, so it should also work on non-NixOS systems. - export NIX_CFLAGS_COMPILE="-DFUSERMOUNT_DIR=\"/var/permissions-wrappers\"" + export NIX_CFLAGS_COMPILE="-DFUSERMOUNT_DIR=\"/run/wrappers\"" sed -e 's@/bin/@${utillinux}/bin/@g' -i lib/mount_util.c sed -e 's@CONFIG_RPATH=/usr/share/gettext/config.rpath@CONFIG_RPATH=${gettext}/share/gettext/config.rpath@' -i makeconf.sh diff --git a/pkgs/os-specific/linux/mdadm/4.nix b/pkgs/os-specific/linux/mdadm/4.nix index abe8632773f..af8e53ec3a2 100644 --- a/pkgs/os-specific/linux/mdadm/4.nix +++ b/pkgs/os-specific/linux/mdadm/4.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { preConfigure = '' sed -e 's@/lib/udev@''${out}/lib/udev@' \ -e 's@ -Werror @ @' \ - -e 's@/usr/sbin/sendmail@/var/permissions-wrappers/sendmail@' -i Makefile + -e 's@/usr/sbin/sendmail@/run/wrappers/sendmail@' -i Makefile ''; meta = { diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index 531d55a7f12..d9bdf21723b 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { preConfigure = '' sed -e 's@/lib/udev@''${out}/lib/udev@' \ -e 's@ -Werror @ @' \ - -e 's@/usr/sbin/sendmail@/var/permissions-wrappers/sendmail@' -i Makefile + -e 's@/usr/sbin/sendmail@/run/wrappers/sendmail@' -i Makefile ''; meta = { diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index 196af58183f..dc61b3f27f6 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { postInstall = '' mv -v $out/sbin/unix_chkpwd{,.orig} - ln -sv /var/permissions-wrappers/unix_chkpwd $out/sbin/unix_chkpwd + ln -sv /run/wrappers/unix_chkpwd $out/sbin/unix_chkpwd ''; /* rm -rf $out/etc mkdir -p $modules/lib diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 1c4a7b798ce..90fbf861448 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { --enable-last --enable-mesg --disable-use-tty-group - --enable-fs-paths-default=/var/permissions-wrappers:/var/run/current-system/sw/bin:/sbin + --enable-fs-paths-default=/run/wrappers:/var/run/current-system/sw/bin:/sbin ${if ncurses == null then "--without-ncurses" else ""} ${if systemd == null then "" else '' --with-systemd |