summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorJesper Geertsen Jonsson <yesbox@users.noreply.github.com>2018-09-08 15:04:12 +0200
committerJesper Geertsen Jonsson <yesbox@users.noreply.github.com>2018-09-11 18:19:51 +0200
commit8a03ec0a32f1ef97a1290a0f0ad75e1f33f1fa46 (patch)
tree1e2899a9304fcd151c0f1b82faeb44ab522f1fab /pkgs
parent6960a96a0c7fa7dcfb3282ef352942a68515a3ad (diff)
downloadnixpkgs-8a03ec0a32f1ef97a1290a0f0ad75e1f33f1fa46.tar
nixpkgs-8a03ec0a32f1ef97a1290a0f0ad75e1f33f1fa46.tar.gz
nixpkgs-8a03ec0a32f1ef97a1290a0f0ad75e1f33f1fa46.tar.bz2
nixpkgs-8a03ec0a32f1ef97a1290a0f0ad75e1f33f1fa46.tar.lz
nixpkgs-8a03ec0a32f1ef97a1290a0f0ad75e1f33f1fa46.tar.xz
nixpkgs-8a03ec0a32f1ef97a1290a0f0ad75e1f33f1fa46.tar.zst
nixpkgs-8a03ec0a32f1ef97a1290a0f0ad75e1f33f1fa46.zip
Fixes the lldpd service failing to start
Backports a patch that will be included in later upstream versions.
The patch removes a call to /bin/mkdir.
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/tools/networking/lldpd/default.nix12
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/tools/networking/lldpd/default.nix b/pkgs/tools/networking/lldpd/default.nix
index 02e4672a1ae..81456c1b852 100644
--- a/pkgs/tools/networking/lldpd/default.nix
+++ b/pkgs/tools/networking/lldpd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, pkgconfig, removeReferencesTo
+{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, removeReferencesTo
 , libevent, readline, net_snmp }:
 
 stdenv.mkDerivation rec {
@@ -10,6 +10,16 @@ stdenv.mkDerivation rec {
     sha256 = "0lgiappbjm95r1m0xyxb6gzz4izcjixknbzq3s7pbqbsmhm642s5";
   };
 
+  patches = [
+    # Fixes #44507: The service fails to start due to a /bin/mkdir call.
+    # Should be included in the upstream release after 1.0.1.
+    # Please remove this patch when updating and ensure the NixOS service starts.
+    (fetchpatch {
+      url = "https://github.com/vincentbernat/lldpd/commit/90a50860ebdcdeb5b7dc85790b18bed23c97ec32.patch";
+      sha256 = "005i4ldc4mfzfmvbnid6849ax2i93mx8nkyf8vjv8k73bfpdza8z";
+    })
+  ];
+
   configureFlags = [
     "--localstatedir=/var"
     "--enable-pie"