summary refs log tree commit diff
diff options
context:
space:
mode:
authorrnhmjoj <rnhmjoj@inventati.org>2023-03-04 20:08:18 +0100
committerrnhmjoj <rnhmjoj@inventati.org>2023-03-04 22:55:46 +0100
commit93dd7ceb13878a626275636ed3a32df3dc5b0021 (patch)
tree00f87d071f924ee2cfdf3ef7b4e961fce9ac7d80
parent6a6349cc338df56f6d7092382ba22338f1077f03 (diff)
downloadnixpkgs-93dd7ceb13878a626275636ed3a32df3dc5b0021.tar
nixpkgs-93dd7ceb13878a626275636ed3a32df3dc5b0021.tar.gz
nixpkgs-93dd7ceb13878a626275636ed3a32df3dc5b0021.tar.bz2
nixpkgs-93dd7ceb13878a626275636ed3a32df3dc5b0021.tar.lz
nixpkgs-93dd7ceb13878a626275636ed3a32df3dc5b0021.tar.xz
nixpkgs-93dd7ceb13878a626275636ed3a32df3dc5b0021.tar.zst
nixpkgs-93dd7ceb13878a626275636ed3a32df3dc5b0021.zip
libreswan: fix yet another path
-rw-r--r--pkgs/tools/networking/libreswan/default.nix5
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/tools/networking/libreswan/default.nix
index 47838f75663..a8e0dccdd2b 100644
--- a/pkgs/tools/networking/libreswan/default.nix
+++ b/pkgs/tools/networking/libreswan/default.nix
@@ -89,6 +89,11 @@ stdenv.mkDerivation rec {
         -e 's|systemd-tmpfiles|true|g' \
         -i initsystems/systemd/Makefile
 
+    # Fix systemd detection on NixOS
+    sed -e 's|\(-a ! -x /bin/journalctl\)|\1 -a ! -x /run/current-system/sw/bin/journalctl|g' \
+        -e 's|\(-o ! -x /bin/journalctl\)|\1 -o ! -x /run/current-system/sw/bin/journalctl|g' \
+        -i programs/barf/barf.in
+
     # Fix the ipsec program from crushing the PATH
     sed -e 's|\(PATH=".*"\):.*$|\1:$PATH|' -i programs/ipsec/ipsec.in