nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 07:23:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

gebaar-libinput: fix build with gcc 11+

Browse Source
This commit is contained in:
Weijia Wang 2023-12-11 01:51:56 +01:00
parent 64891e361b
commit 7a32e1f807
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/tools/inputmethods/gebaar-libinput/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, pkg-config, cmake, libinput, zlib }:
{ stdenv, lib, fetchFromGitHub, fetchpatch, pkg-config, cmake, libinput, zlib }:
stdenv.mkDerivation rec {
pname = "gebaar-libinput";
@ -12,6 +12,14 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
patches = [
# fix build with gcc 11+
(fetchpatch {
url = "https://github.com/9ary/gebaar-libinput-fork/commit/25cac08a5f1aed1951b03de12fa0010a0964967d.patch";
hash = "sha256-CtgfMTBCXotiPAXc7cA3h+7Kb0NHFi/q7w72IY32CyA=";
})
];
nativeBuildInputs = [ pkg-config cmake ];
buildInputs = [ libinput zlib ];

2
pkgs/top-level/all-packages.nix
View File

@ -7019,7 +7019,7 @@ with pkgs;
inherit (darwin.apple_sdk_11_0.frameworks) Security CoreServices SystemConfiguration;
};
gebaar-libinput = callPackage ../tools/inputmethods/gebaar-libinput { stdenv = gcc10StdenvCompat; };
gebaar-libinput = callPackage ../tools/inputmethods/gebaar-libinput { };
kime = callPackage ../tools/inputmethods/kime { };