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

Merge pull request #195080 from sternenseemann/grim-i686-fix

Browse Source 
grim: patch for 32bit platforms
This commit is contained in:
Jörg Thalheim 2022-10-08 16:02:50 +02:00 committed by GitHub
commit 748c7563ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/tools/graphics/grim/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromSourcehut, pixman, libpng, libjpeg, meson, ninja, wayland, pkg-config, scdoc, wayland-protocols }:
{ lib, stdenv, fetchFromSourcehut, fetchpatch, pixman, libpng, libjpeg, meson, ninja, wayland, pkg-config, scdoc, wayland-protocols }:
stdenv.mkDerivation rec {
pname = "grim";
@ -11,6 +11,19 @@ stdenv.mkDerivation rec {
sha256 = "sha256-lwJn1Lysv1qLauqmrduUlzdoKUrUM5uBjv+dWSsrM6w=";
};
mesonFlags = [
"-Dwerror=false"
];
patches = [
# Fixes build on 32bit platforms. Patch is upstream, but unreleased
(fetchpatch {
name = "grim-fix-32bit-printf.patch";
url = "https://git.sr.ht/~emersion/grim/commit/89e02e663fabc534b7e7039514f60a8c5d70070d.patch";
sha256 = "1gwb060v3q856p84y0mqqpkqmgb9jwn70y4mzv35y4b9xld8inci";
})
];
nativeBuildInputs = [
meson
ninja