diff options
| author | Timo Kaufmann <timokau@zoho.com> | 2018-09-11 20:44:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-11 20:44:01 +0200 |
| commit | eae589058c12d2470ef7948eb4158f42382b03ec (patch) | |
| tree | bb10c43d843f99d2f3c311b12ad98eabc66880a5 /pkgs | |
| parent | b6bfbafe5eab64faac9da8190996e916b242673a (diff) | |
| parent | 8a03ec0a32f1ef97a1290a0f0ad75e1f33f1fa46 (diff) | |
| download | nixlib-eae589058c12d2470ef7948eb4158f42382b03ec.tar nixlib-eae589058c12d2470ef7948eb4158f42382b03ec.tar.gz nixlib-eae589058c12d2470ef7948eb4158f42382b03ec.tar.bz2 nixlib-eae589058c12d2470ef7948eb4158f42382b03ec.tar.lz nixlib-eae589058c12d2470ef7948eb4158f42382b03ec.tar.xz nixlib-eae589058c12d2470ef7948eb4158f42382b03ec.tar.zst nixlib-eae589058c12d2470ef7948eb4158f42382b03ec.zip | |
Merge pull request #46367 from yesbox/lldpd_nixos_18.09_fix
Fixes the lldpd service not starting on NixOS 18.09
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/networking/lldpd/default.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/tools/networking/lldpd/default.nix b/pkgs/tools/networking/lldpd/default.nix index 02e4672a1aee..81456c1b852d 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" |