colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

buffybox: apply patches against upstream master, instead of sourcing my fork directly

Browse Source
This commit is contained in:
Colin
2024-10-05 13:26:10 +00:00
parent 526ad60d6c
commit 62faaebb76
1 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
pkgs/by-name/buffybox/package.nix
View File

@@ -1,6 +1,7 @@
{ {
fetchFromGitLab, fetchFromGitLab,
fetchFromGitea, fetchFromGitea,
fetchpatch2,
inih, inih,
lib, lib,
libdrm, libdrm,
@@ -15,30 +16,39 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "buffybox"; pname = "buffybox";
version = "3.2.0-unstable-2024-10-05"; version = "3.2.0-unstable-2024-09-26";
# TODO: upstream my changes: # src = fetchFromGitea {
# - cross compilation fix # domain = "git.uninsane.org";
# - sleep instead of poll (CPU reduction) # owner = "colin";
# src = fetchFromGitLab {
# domain = "gitlab.com";
# owner = "postmarketOS";
# repo = "buffybox"; # repo = "buffybox";
# rev = finalAttrs.version;
# fetchSubmodules = true; # to use its vendored lvgl # fetchSubmodules = true; # to use its vendored lvgl
# hash = "sha256-nZX7mSY9IBIhVNmOD6mXI1IF2TgyKLc00a8ADAvVLB0="; # rev = "575341a22bf6bfbdedbe5b75fe7845b642fadda9";
# hash = "sha256-EkXYNbdVMTqHcrsPqFnF8SEwN4UKzPOdQecLcZdBi1s=";
# }; # };
src = fetchFromGitea { src = fetchFromGitLab {
domain = "git.uninsane.org"; domain = "gitlab.com";
owner = "colin"; owner = "postmarketOS";
repo = "buffybox"; repo = "buffybox";
fetchSubmodules = true; # to use its vendored lvgl fetchSubmodules = true; # to use its vendored lvgl
rev = "575341a22bf6bfbdedbe5b75fe7845b642fadda9"; rev = "1e5ae8f8e5c00dd00e16268f1668cfb9e7c447f9";
hash = "sha256-EkXYNbdVMTqHcrsPqFnF8SEwN4UKzPOdQecLcZdBi1s="; hash = "sha256-A8zVLu6pYR0cVJntv6HRKijfSuvsWC+VV7DQH+Swgds=";
}; };
patches = [
(fetchpatch2 {
name = "specify scdoc as a native dependency instead of a runtime dependency";
url = "https://gitlab.com/postmarketOS/buffybox/-/merge_requests/30.diff";
hash = "sha256-PCUxdldOuS3aqgGfu2n128DBBWd3K/Z0GYTi3W+EmLI=";
})
(fetchpatch2 {
name = "use OS sleep instead of polling to reduce CPU usage";
url = "https://gitlab.com/postmarketOS/buffybox/-/merge_requests/31.diff";
hash = "sha256-zMtP4q5b7vBLyfOmu2Dl2h+aPuOUgeOSp4PU6dP/5Rs=";
})
];
depsBuildBuild = [ depsBuildBuild = [
pkg-config pkg-config
]; ];