graphia: 2.2 -> 3.0

authored by

Jonas Heinrich and committed by
Yt
2349dd5c 6537fa2a

+36 -5
+13
pkgs/applications/science/misc/graphia/breakpad-sigstksz.patch
··· 1 + diff --git a/source/thirdparty/breakpad/src/client/linux/handler/exception_handler.cc b/source/thirdparty/breakpad/src/client/linux/handler/exception_handler.cc 2 + index ca353c4099..499be0a986 100644 3 + --- a/source/thirdparty/breakpad/src/client/linux/handler/exception_handler.cc 4 + +++ b/source/thirdparty/breakpad/src/client/linux/handler/exception_handler.cc 5 + @@ -138,7 +138,7 @@ void InstallAlternateStackLocked() { 6 + // SIGSTKSZ may be too small to prevent the signal handlers from overrunning 7 + // the alternative stack. Ensure that the size of the alternative stack is 8 + // large enough. 9 + - static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); 10 + + const unsigned kSigStackSize = std::max<unsigned>(16384, SIGSTKSZ); 11 + 12 + // Only set an alternative stack if there isn't already one, or if the current 13 + // one is too small.
+18 -4
pkgs/applications/science/misc/graphia/default.nix
··· 1 - { stdenv, lib, cmake, fetchFromGitHub 2 - , wrapQtAppsHook, qtbase, qtquickcontrols2, qtgraphicaleffects 1 + { stdenv 2 + , lib 3 + , cmake 4 + , fetchFromGitHub 5 + , wrapQtAppsHook 6 + , qtbase 7 + , qtquickcontrols2 8 + , qtgraphicaleffects 3 9 }: 4 10 5 11 stdenv.mkDerivation rec { 6 12 pname = "graphia"; 7 - version = "2.2"; 13 + version = "3.0"; 8 14 9 15 src = fetchFromGitHub { 10 16 owner = "graphia-app"; 11 17 repo = "graphia"; 12 18 rev = version; 13 - sha256 = "sha256:05givvvg743sawqy2vhljkfgn5v1s907sflsnsv11ddx6x51na1w"; 19 + sha256 = "sha256-9JIVMtu8wlux7vIapOQQIemE7ehIol2XZuIvwLfB8fY="; 14 20 }; 15 21 22 + patches = [ 23 + # Fix for a breakpad incompatibility with glibc>2.33 24 + # https://github.com/pytorch/pytorch/issues/70297 25 + # https://github.com/google/breakpad/commit/605c51ed96ad44b34c457bbca320e74e194c317e 26 + ./breakpad-sigstksz.patch 27 + ]; 28 + 16 29 nativeBuildInputs = [ 17 30 cmake 18 31 wrapQtAppsHook 19 32 ]; 33 + 20 34 buildInputs = [ 21 35 qtbase 22 36 qtquickcontrols2
+5 -1
pkgs/top-level/all-packages.nix
··· 17745 17745 17746 17746 ghcid = haskellPackages.ghcid.bin; 17747 17747 17748 - graphia = libsForQt5.callPackage ../applications/science/misc/graphia { }; 17748 + graphia = libsForQt514.callPackage ../applications/science/misc/graphia { 17749 + # Using gcc 10 because this fails to build with gcc 11 17750 + # Error similar to this https://github.com/RPCS3/rpcs3/issues/10291 17751 + stdenv = gcc10Stdenv; 17752 + }; 17749 17753 17750 17754 icon-lang = callPackage ../development/interpreters/icon-lang { }; 17751 17755