cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #273452 from wegank/gebaar-libinput-stdenv

Browse source 
gebaar-libinput: fix build with gcc 11+
This commit is contained in:
Weijia Wang 2024-01-11 08:02:24 +01:00 committed by GitHub
commit 5c7a664603
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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

@ -7007,7 +7007,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 { };