dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #46367 from yesbox/lldpd_nixos_18.09_fix

Browse Source 
Fixes the lldpd service not starting on NixOS 18.09
This commit is contained in:
Timo Kaufmann 2018-09-11 20:44:01 +02:00 committed by GitHub
commit eae589058c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/tools/networking/lldpd/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, pkgconfig, removeReferencesTo { stdenv, lib, fetchurl, fetchpatch, pkgconfig, removeReferencesTo
, libevent, readline, net_snmp }: , libevent, readline, net_snmp }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -10,6 +10,16 @@ stdenv.mkDerivation rec {
sha256 = "0lgiappbjm95r1m0xyxb6gzz4izcjixknbzq3s7pbqbsmhm642s5"; 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 = [ configureFlags = [
"--localstatedir=/var" "--localstatedir=/var"
"--enable-pie" "--enable-pie"