diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-04-16 19:02:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-16 19:02:56 +0200 |
| commit | 2b52da5f99e60ad2b278c71d74e00cb2704639e3 (patch) | |
| tree | 82e9efd9415aacee498341b82fa25ce58d74a1c6 /pkgs/os-specific/linux | |
| parent | 972c0ca809f95f76a0d6eca43cc4c4c4a34811f5 (diff) | |
| parent | 65710feb5c03b0e999ce32e60f18bc0f77b7978f (diff) | |
| download | nixlib-2b52da5f99e60ad2b278c71d74e00cb2704639e3.tar nixlib-2b52da5f99e60ad2b278c71d74e00cb2704639e3.tar.gz nixlib-2b52da5f99e60ad2b278c71d74e00cb2704639e3.tar.bz2 nixlib-2b52da5f99e60ad2b278c71d74e00cb2704639e3.tar.lz nixlib-2b52da5f99e60ad2b278c71d74e00cb2704639e3.tar.xz nixlib-2b52da5f99e60ad2b278c71d74e00cb2704639e3.tar.zst nixlib-2b52da5f99e60ad2b278c71d74e00cb2704639e3.zip | |
Merge pull request #58222 from bobvanderlinden/var-run-pkgs
tree-wide: pkgs: /var/run -> /run
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/udisks/1-default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/util-linux/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/udisks/1-default.nix b/pkgs/os-specific/linux/udisks/1-default.nix index d48c21f6b52a..03c48867b342 100644 --- a/pkgs/os-specific/linux/udisks/1-default.nix +++ b/pkgs/os-specific/linux/udisks/1-default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { substituteInPlace src/main.c --replace \ "/sbin:/bin:/usr/sbin:/usr/bin" \ - "${utillinux}/bin:${mdadm}/sbin:/var/run/current-system/sw/bin:/var/run/current-system/sw/bin" + "${utillinux}/bin:${mdadm}/sbin:/run/current-system/sw/bin:/run/current-system/sw/bin" ''; buildInputs = diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index ec18c25ee665..3e94ba5c1ea2 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { "--enable-last" "--enable-mesg" "--disable-use-tty-group" - "--enable-fs-paths-default=/run/wrappers/bin:/var/run/current-system/sw/bin:/sbin" + "--enable-fs-paths-default=/run/wrappers/bin:/run/current-system/sw/bin:/sbin" "--disable-makeinstall-setuid" "--disable-makeinstall-chown" (lib.withFeature (ncurses != null) "ncursesw") (lib.withFeature (systemd != null) "systemd") |