diff options
| author | K900 <me@0upti.me> | 2022-11-26 15:48:41 +0300 |
|---|---|---|
| committer | K900 <me@0upti.me> | 2022-11-26 15:49:07 +0300 |
| commit | 420fd2d25b739795ff3280569dea186638e65d26 (patch) | |
| tree | 1b8bb272a86cfcac42600cc5d6631f5ad9d2f159 | |
| parent | 40d2157f923b2b5514d06c20d3522546ee0157ad (diff) | |
| download | nixpkgs-420fd2d25b739795ff3280569dea186638e65d26.tar nixpkgs-420fd2d25b739795ff3280569dea186638e65d26.tar.gz nixpkgs-420fd2d25b739795ff3280569dea186638e65d26.tar.bz2 nixpkgs-420fd2d25b739795ff3280569dea186638e65d26.tar.lz nixpkgs-420fd2d25b739795ff3280569dea186638e65d26.tar.xz nixpkgs-420fd2d25b739795ff3280569dea186638e65d26.tar.zst nixpkgs-420fd2d25b739795ff3280569dea186638e65d26.zip | |
graphia: 3.1 -> 3.2
| -rw-r--r-- | pkgs/applications/science/misc/graphia/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
2 files changed, 10 insertions, 7 deletions
diff --git a/pkgs/applications/science/misc/graphia/default.nix b/pkgs/applications/science/misc/graphia/default.nix index ce712ef182b..b06cfaae66b 100644 --- a/pkgs/applications/science/misc/graphia/default.nix +++ b/pkgs/applications/science/misc/graphia/default.nix @@ -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 = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed7f7bd924b..1e17b834e55 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19078,11 +19078,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 { }; |