mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-30 08:44:31 +00:00
Merge pull request #203057 from K900/update-graphia
graphia: 3.1 -> 3.2
This commit is contained in:
commit
10f2299b8e
@ -2,6 +2,7 @@
|
||||
, lib
|
||||
, cmake
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, wrapQtAppsHook
|
||||
, qtbase
|
||||
, qtquickcontrols2
|
||||
@ -10,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "graphia";
|
||||
version = "3.1";
|
||||
version = "3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "graphia-app";
|
||||
repo = "graphia";
|
||||
rev = version;
|
||||
sha256 = "sha256-mqoK5y2h0JSiE9VtwawCgc1+qETzuefLVUpgFPcNFnk=";
|
||||
sha256 = "sha256-9kohXLXF4F/qoHm8qmvPM1y9ak0Thb4xvgKJlVuOPTg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -24,6 +25,12 @@ stdenv.mkDerivation rec {
|
||||
# https://github.com/pytorch/pytorch/issues/70297
|
||||
# https://github.com/google/breakpad/commit/605c51ed96ad44b34c457bbca320e74e194c317e
|
||||
./breakpad-sigstksz.patch
|
||||
|
||||
# FIXME: backport patch fixing build with Qt 5.15, remove for next release
|
||||
(fetchpatch {
|
||||
url = "https://github.com/graphia-app/graphia/commit/4b51bb8d465afa7ed0b2b30cb1c5e1c6af95976f.patch";
|
||||
hash = "sha256-GDJAFLxQlRWKvcOgqqPYV/aVTRM7+KDjW7Zp9l7SuyM=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -19091,11 +19091,7 @@ with pkgs;
|
||||
|
||||
ghcid = haskellPackages.ghcid.bin;
|
||||
|
||||
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;
|
||||
};
|
||||
graphia = libsForQt5.callPackage ../applications/science/misc/graphia { };
|
||||
|
||||
graphinder = callPackage ../tools/security/graphinder { };
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user