From 2f194c456a5887b50e6fe2626fccef3500eec179 Mon Sep 17 00:00:00 2001 From: Vanilla Date: Wed, 8 Jan 2025 09:28:23 +0800 Subject: [PATCH] gpick: fix build with boost 1.86.0. --- pkgs/by-name/gp/gpick/package.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/gp/gpick/package.nix b/pkgs/by-name/gp/gpick/package.nix index 7c0502ea3232..913e0dd95c6a 100644 --- a/pkgs/by-name/gp/gpick/package.nix +++ b/pkgs/by-name/gp/gpick/package.nix @@ -2,11 +2,10 @@ stdenv, fetchFromGitHub, cmake, - wrapGAppsHook3, boost, - pkg-config, - gtk3, ragel, + pkg-config, + wrapGAppsHook3, lua, fetchpatch, lib, @@ -28,7 +27,12 @@ stdenv.mkDerivation rec { ./dot-version.patch (fetchpatch { - url = "https://raw.githubusercontent.com/archlinux/svntogit-community/1d53a9aace4bb60300e52458bb1577d248cb87cd/trunk/buildfix.diff"; + url = "https://patch-diff.githubusercontent.com/raw/thezbyg/gpick/pull/227.patch"; + hash = "sha256-qYspUctvlPMEK/c2hMUxYc5EYdG//CBcN2PluTtXiFc="; + }) + + (fetchpatch { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/gpick/-/raw/0.3-2/buildfix.diff"; hash = "sha256-DnRU90VPyFhLYTk4GPJoiVYadJgtYgjMS4MLgmpYLP0="; }) ]; @@ -38,9 +42,9 @@ stdenv.mkDerivation rec { pkg-config wrapGAppsHook3 ]; + buildInputs = [ boost - gtk3 ragel lua ];