diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-06-05 21:29:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-05 21:29:16 +0200 |
| commit | 2e7cde1ba1eb98b31f5fef975db24fbca0608c19 (patch) | |
| tree | 979a9a45b79e78340200e617b1cf38fea07fed82 /pkgs/applications | |
| parent | a58bfdb21c2b5c0edddd3446595cd199cbeec53b (diff) | |
| parent | da5278cbd573dafa5b741d5e2b5af93f55ff1bac (diff) | |
| download | nixpkgs-2e7cde1ba1eb98b31f5fef975db24fbca0608c19.tar nixpkgs-2e7cde1ba1eb98b31f5fef975db24fbca0608c19.tar.gz nixpkgs-2e7cde1ba1eb98b31f5fef975db24fbca0608c19.tar.bz2 nixpkgs-2e7cde1ba1eb98b31f5fef975db24fbca0608c19.tar.lz nixpkgs-2e7cde1ba1eb98b31f5fef975db24fbca0608c19.tar.xz nixpkgs-2e7cde1ba1eb98b31f5fef975db24fbca0608c19.tar.zst nixpkgs-2e7cde1ba1eb98b31f5fef975db24fbca0608c19.zip | |
Merge pull request #125679 from polygon/dsview
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 ]; |