pyrox.dev
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.
+11
pkgs/applications/science/electronics/dsview/default.nix
+11
pkgs/applications/science/electronics/dsview/default.nix
···
25
25
# Using local file instead of content of commit #33e3d896a47 because
26
26
# sourceRoot make it unappliable
27
27
./qt515.patch
28
+
29
+
# Change from upstream master that removes extern-C scopes which
30
+
# cause failures with modern glib. This can likely be removed if
31
+
# there is an upstream release >1.12
32
+
(fetchpatch {
33
+
name = "fix-extern-c.patch";
34
+
url = "https://github.com/DreamSourceLab/DSView/commit/33cc733abe19872bf5ed08540a94b798d0d4ecf4.patch";
35
+
sha256 = "sha256-TLfLQa3sdyNHTpMMvId/V6uUuOFihOZMFJOj9frnDoY=";
36
+
stripLen = 2;
37
+
extraPrefix = "";
38
+
})
28
39
];
29
40
30
41
nativeBuildInputs = [ cmake pkg-config ];