summary refs log tree commit diff
path: root/pkgs/os-specific/linux/sysklogd
diff options
context:
space:
mode:
authorLuke Granger-Brown <git@lukegb.com>2021-09-07 16:23:11 +0000
committerLuke Granger-Brown <git@lukegb.com>2021-09-07 16:23:11 +0000
commit9094826af801b643cd0d874c720619b24bad8bf5 (patch)
treeb5d87043cad29d1e8e2e3ddb2e6b00e5ace71775 /pkgs/os-specific/linux/sysklogd
parent1871f272ecbe6f7c6cb05d82306e765545578db9 (diff)
parentf238a66a7cd9a875ce72c9e2f56a5ed2abfe865f (diff)
downloadnixpkgs-9094826af801b643cd0d874c720619b24bad8bf5.tar
nixpkgs-9094826af801b643cd0d874c720619b24bad8bf5.tar.gz
nixpkgs-9094826af801b643cd0d874c720619b24bad8bf5.tar.bz2
nixpkgs-9094826af801b643cd0d874c720619b24bad8bf5.tar.lz
nixpkgs-9094826af801b643cd0d874c720619b24bad8bf5.tar.xz
nixpkgs-9094826af801b643cd0d874c720619b24bad8bf5.tar.zst
nixpkgs-9094826af801b643cd0d874c720619b24bad8bf5.zip
Merge remote-tracking branch 'upstream/staging-next' into staging-fix
Diffstat (limited to 'pkgs/os-specific/linux/sysklogd')
-rw-r--r--pkgs/os-specific/linux/sysklogd/default.nix11
1 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/sysklogd/default.nix b/pkgs/os-specific/linux/sysklogd/default.nix
index 8e02ab71dbe..4d9844f516b 100644
--- a/pkgs/os-specific/linux/sysklogd/default.nix
+++ b/pkgs/os-specific/linux/sysklogd/default.nix
@@ -15,6 +15,17 @@ stdenv.mkDerivation rec {
 
   installFlags = [ "BINDIR=$(out)/sbin" "MANDIR=$(out)/share/man" "INSTALL=install" ];
 
+  makeFlags = [
+    "CC=${stdenv.cc.targetPrefix}cc"
+  ];
+
+  postPatch = ''
+    # Disable stripping during installation, stripping will be done anyway.
+    # Fixes cross-compilation.
+    substituteInPlace Makefile \
+      --replace "-m 500 -s" "-m 500"
+  '';
+
   preConfigure =
     ''
       sed -e 's@-o \''${MAN_USER} -g \''${MAN_GROUP} -m \''${MAN_PERMS} @@' -i Makefile