summary refs log tree commit diff
path: root/pkgs/servers/monitoring/lcdproc/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/servers/monitoring/lcdproc/default.nix')
-rw-r--r--pkgs/servers/monitoring/lcdproc/default.nix9
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/servers/monitoring/lcdproc/default.nix b/pkgs/servers/monitoring/lcdproc/default.nix
index bd0a7dc0dfb..949be34b80b 100644
--- a/pkgs/servers/monitoring/lcdproc/default.nix
+++ b/pkgs/servers/monitoring/lcdproc/default.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, fetchpatch
 , autoreconfHook
 , makeWrapper
 , pkg-config
@@ -27,6 +28,14 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./hardcode_mtab.patch
+
+    # Pull upstream fix for -fno-common toolchains:
+    #   https://github.com/lcdproc/lcdproc/pull/148
+    (fetchpatch {
+      name = "fno-common.patch";
+      url = "https://github.com/lcdproc/lcdproc/commit/fda5302878692da933dc03cd011f8ddffefa07a4.patch";
+      sha256 = "0ld6p1r4rjsnjr63afw3lp5lx25jxjs07lsp9yc3q96r91r835cy";
+    })
   ];
 
   # we don't need to see the GPL every time we launch lcdd in the foreground