cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

dsview: fix build

Browse source 
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.
This commit is contained in:
polygon 2021-06-04 15:36:53 +02:00
parent f36a65f6e2
commit da5278cbd5
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/applications/science/electronics/dsview/default.nix
View file

@ -25,6 +25,17 @@ mkDerivation rec {
# Using local file instead of content of commit #33e3d896a47 because # Using local file instead of content of commit #33e3d896a47 because
# sourceRoot make it unappliable # sourceRoot make it unappliable
./qt515.patch ./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 ]; nativeBuildInputs = [ cmake pkg-config ];