about summary refs log tree commit diff
path: root/pkgs/build-support
diff options
context:
space:
mode:
authorStella <keksbg@riseup.net>2022-07-16 01:34:01 +0300
committerJonathan Ringer <jonringer@users.noreply.github.com>2022-10-18 22:50:59 -0700
commitfbf83cda379ff47cb7c9dbde72bbdce1fc1cf92e (patch)
tree681bfc1221a9894c5e1ba0ba8505779a3f91d835 /pkgs/build-support
parent67c3fe62d326b2ea70afc50e0521070f3de5da17 (diff)
build-fhs-userenv-bubblewrap: use -m not -f for readlink
This change will let more inexistent paths be passed along, avoiding extremely weird and hard to debug behavior. See https://github.com/containers/bubblewrap/issues/520 for what I personally encountered.
Diffstat (limited to 'pkgs/build-support')
-rw-r--r--pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix
index f66ad38f7b86e..d0f11fd6e1092 100644
--- a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix
+++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix
@@ -71,7 +71,7 @@ let
       "pki"
     ];
   in concatStringsSep "\n  "
-  (map (file: "--ro-bind-try $(${coreutils}/bin/readlink -f /etc/${file}) /etc/${file}") files);
+  (map (file: "--ro-bind-try $(${coreutils}/bin/readlink -m /etc/${file}) /etc/${file}") files);
 
   # Create this on the fly instead of linking from /nix
   # The container might have to modify it and re-run ldconfig if there are