colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i3lock-blur: pull patch pending upstream inclusion for -fno-common toolchain support

Browse Source 
Without the change build on upstream gcc-10 fals as:

    ld: i3lock-unlock_indicator.o:/build/source/x86_64-pc-linux-gnu/../../source/unlock_indicator.c:39:
      multiple definition of `input_position'; i3lock-i3lock.o:/build/source/x86_64-pc-linux-gnu/../../source/i3lock.c:73: first defined here
This commit is contained in:
Sergei Trofimovich 2022-05-15 10:40:32 +01:00
parent 09692a459c
commit 1838712a15
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/applications/window-managers/i3/lock-blur.nix
View File

@ -1,4 +1,4 @@
{ i3lock-color, lib, stdenv, fetchFromGitHub }:
{ i3lock-color, lib, stdenv, fetchFromGitHub, fetchpatch }:
i3lock-color.overrideAttrs (oldAttrs : rec {
pname = "i3lock-blur";
@ -11,6 +11,16 @@ i3lock-color.overrideAttrs (oldAttrs : rec {
sha256 = "sha256-rBQHYVD9rurzTEXrgEnOziOP22D2EePC1+EV9Wi2pa0=";
};
patches = [
# Pull patch pending upstream inclusion for -fno-common toolchain
# support: https://github.com/karulont/i3lock-blur/pull/22
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/karulont/i3lock-blur/commit/ec8fe0e7f7d78bf445602ed517efd5c324bb32f7.patch";
sha256 = "sha256-0hXUr+ZEB1tpI3xw80/hGzKyeGuna4CQmEvK6t0VBqU=";
})
];
meta = with lib; {
description = "An improved screenlocker based upon XCB and PAM with background blurring filter";
homepage = "https://github.com/karulont/i3lock-blur/";