Merge pull request #238838 from trofi/grim-update

grim: 1.4.0 -> 1.4.1
This commit is contained in:
Weijia Wang
2023-06-21 08:00:15 +03:00
committed by GitHub
+2 -12
View File
@@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromSourcehut
, fetchpatch
, pixman
, libpng
, libjpeg
@@ -16,28 +15,19 @@
stdenv.mkDerivation rec {
pname = "grim";
version = "1.4.0";
version = "1.4.1";
src = fetchFromSourcehut {
owner = "~emersion";
repo = pname;
rev = "v${version}";
sha256 = "sha256-lwJn1Lysv1qLauqmrduUlzdoKUrUM5uBjv+dWSsrM6w=";
sha256 = "sha256-5csJqRLNqhyeXR4dEQtnPUSwuZ8oY+BIt6AVICkm1+o=";
};
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