diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2024-02-10 15:48:14 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2024-02-10 15:48:14 +0000 |
| commit | f2e039573f112d1c5d7a8f0769fe1f0ed5e75a9d (patch) | |
| tree | 53647a01a18e8d7e2584959de421ac90daa2cfd5 /pkgs/applications/video | |
| parent | 1ab54f84dcd5ba80790ae7e9d593285d9b86b958 (diff) | |
natron: fix `gcc-13` build
Without the change the build fails on` master as
https://hydra.nixos.org/build/247702188:
../Global/GlobalDefines.h:69:14: error: no type named 'uint32_t' in namespace 'std'
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/natron/default.nix | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix index d5c603998f3db..5ca88c666ee85 100644 --- a/pkgs/applications/video/natron/default.nix +++ b/pkgs/applications/video/natron/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , pkg-config , wrapQtAppsHook @@ -37,6 +38,23 @@ stdenv.mkDerivation { hash = "sha256-dgScbfyulZPlrngqSw7xwipldoRd8uFO8VP9mlJyhQ8="; }; + patches = [ + # Fix gcc-13 build: + # https://github.com/NatronGitHub/Natron/pull/929 + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/NatronGitHub/Natron/commit/4b44fb18293035873b35c3a2d2aa29da78cb8740.patch"; + includes = ["Global/GlobalDefines.h"]; + hash = "sha256-9E1tJCvO7zA1iQAhrlL3GaBFIGpkjxNOr31behQXdhQ="; + }) + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/NatronGitHub/Natron/commit/f21f58622e32c1684567c82e2ab361f33030bda7.patch"; + includes = ["Engine/Noise.cpp"]; + hash = "sha256-t2mzTsRuXVs8d1BB/5uAY1OPxWRa3JTK1iAWLAMsrgs="; + }) + ]; + cmakeFlags = [ "-DNATRON_SYSTEM_LIBS=ON" ]; nativeBuildInputs = [ |