From da5278cbd573dafa5b741d5e2b5af93f55ff1bac Mon Sep 17 00:00:00 2001 From: polygon Date: Fri, 4 Jun 2021 15:36:53 +0200 Subject: [PATCH] dsview: fix build Unneeded extern-C scopes around glib-includes would cause build failures. Upstream has this fixed, but the fixes are not yet part of a new release. Apply the fixing commit from upstream master selectively. This should be removed once there is a new upstream release. --- .../science/electronics/dsview/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/applications/science/electronics/dsview/default.nix b/pkgs/applications/science/electronics/dsview/default.nix index ab16866fe01c..eb8246a584d3 100644 --- a/pkgs/applications/science/electronics/dsview/default.nix +++ b/pkgs/applications/science/electronics/dsview/default.nix @@ -25,6 +25,17 @@ mkDerivation rec { # Using local file instead of content of commit #33e3d896a47 because # sourceRoot make it unappliable ./qt515.patch + + # Change from upstream master that removes extern-C scopes which + # cause failures with modern glib. This can likely be removed if + # there is an upstream release >1.12 + (fetchpatch { + name = "fix-extern-c.patch"; + url = "https://github.com/DreamSourceLab/DSView/commit/33cc733abe19872bf5ed08540a94b798d0d4ecf4.patch"; + sha256 = "sha256-TLfLQa3sdyNHTpMMvId/V6uUuOFihOZMFJOj9frnDoY="; + stripLen = 2; + extraPrefix = ""; + }) ]; nativeBuildInputs = [ cmake pkg-config ];