mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-30 17:49:58 +03:00
Merge pull request #173161 from trofi/fix-fno-common-for-lcdproc
lcdproc: pull upstream fix for fno-common toolchains
This commit is contained in:
commit
c410f07f54
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user