diff options
author | polygon <polygon@wh2.tu-dresden.de> | 2021-06-04 15:36:53 +0200 |
---|---|---|
committer | polygon <polygon@wh2.tu-dresden.de> | 2021-06-04 15:44:27 +0200 |
commit | da5278cbd573dafa5b741d5e2b5af93f55ff1bac (patch) | |
tree | f3008eeb8f163f25c5d7375e8dbeaedbeeda67b2 /pkgs/applications | |
parent | f36a65f6e2e9f3641f12c7d6e48a5ec4b5c5394b (diff) | |
download | nixpkgs-da5278cbd573dafa5b741d5e2b5af93f55ff1bac.tar nixpkgs-da5278cbd573dafa5b741d5e2b5af93f55ff1bac.tar.gz nixpkgs-da5278cbd573dafa5b741d5e2b5af93f55ff1bac.tar.bz2 nixpkgs-da5278cbd573dafa5b741d5e2b5af93f55ff1bac.tar.lz nixpkgs-da5278cbd573dafa5b741d5e2b5af93f55ff1bac.tar.xz nixpkgs-da5278cbd573dafa5b741d5e2b5af93f55ff1bac.tar.zst nixpkgs-da5278cbd573dafa5b741d5e2b5af93f55ff1bac.zip |
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.
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/science/electronics/dsview/default.nix | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/applications/science/electronics/dsview/default.nix b/pkgs/applications/science/electronics/dsview/default.nix index ab16866fe01..eb8246a584d 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 ]; |