graphia: 2.2 -> 3.0
This commit is contained in:
parent
6537fa2abb
commit
2349dd5cb2
|
@ -0,0 +1,13 @@
|
|||
diff --git a/source/thirdparty/breakpad/src/client/linux/handler/exception_handler.cc b/source/thirdparty/breakpad/src/client/linux/handler/exception_handler.cc
|
||||
index ca353c4099..499be0a986 100644
|
||||
--- a/source/thirdparty/breakpad/src/client/linux/handler/exception_handler.cc
|
||||
+++ b/source/thirdparty/breakpad/src/client/linux/handler/exception_handler.cc
|
||||
@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() {
|
||||
// SIGSTKSZ may be too small to prevent the signal handlers from overrunning
|
||||
// the alternative stack. Ensure that the size of the alternative stack is
|
||||
// large enough.
|
||||
- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
|
||||
+ const unsigned kSigStackSize = std::max<unsigned>(16384, SIGSTKSZ);
|
||||
|
||||
// Only set an alternative stack if there isn't already one, or if the current
|
||||
// one is too small.
|
|
@ -1,22 +1,36 @@
|
|||
{ stdenv, lib, cmake, fetchFromGitHub
|
||||
, wrapQtAppsHook, qtbase, qtquickcontrols2, qtgraphicaleffects
|
||||
{ stdenv
|
||||
, lib
|
||||
, cmake
|
||||
, fetchFromGitHub
|
||||
, wrapQtAppsHook
|
||||
, qtbase
|
||||
, qtquickcontrols2
|
||||
, qtgraphicaleffects
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "graphia";
|
||||
version = "2.2";
|
||||
version = "3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "graphia-app";
|
||||
repo = "graphia";
|
||||
rev = version;
|
||||
sha256 = "sha256:05givvvg743sawqy2vhljkfgn5v1s907sflsnsv11ddx6x51na1w";
|
||||
sha256 = "sha256-9JIVMtu8wlux7vIapOQQIemE7ehIol2XZuIvwLfB8fY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix for a breakpad incompatibility with glibc>2.33
|
||||
# https://github.com/pytorch/pytorch/issues/70297
|
||||
# https://github.com/google/breakpad/commit/605c51ed96ad44b34c457bbca320e74e194c317e
|
||||
./breakpad-sigstksz.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtquickcontrols2
|
||||
|
|
|
@ -17745,7 +17745,11 @@ with pkgs;
|
|||
|
||||
ghcid = haskellPackages.ghcid.bin;
|
||||
|
||||
graphia = libsForQt5.callPackage ../applications/science/misc/graphia { };
|
||||
graphia = libsForQt514.callPackage ../applications/science/misc/graphia {
|
||||
# Using gcc 10 because this fails to build with gcc 11
|
||||
# Error similar to this https://github.com/RPCS3/rpcs3/issues/10291
|
||||
stdenv = gcc10Stdenv;
|
||||
};
|
||||
|
||||
icon-lang = callPackage ../development/interpreters/icon-lang { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue