diff options
author | Sergei Trofimovich <slyich@gmail.com> | 2023-07-09 10:15:20 +0100 |
---|---|---|
committer | Sergei Trofimovich <slyich@gmail.com> | 2023-07-09 10:17:05 +0100 |
commit | de5233cf6126d0e8973ae1443a482bace34a5173 (patch) | |
tree | ef14b9b22387c3c580ee239f1d4f81d997d4bb7f | |
parent | 4cee14d1c9cb8a65f235160de3ba26e5757b791d (diff) | |
download | nixpkgs-de5233cf6126d0e8973ae1443a482bace34a5173.tar nixpkgs-de5233cf6126d0e8973ae1443a482bace34a5173.tar.gz nixpkgs-de5233cf6126d0e8973ae1443a482bace34a5173.tar.bz2 nixpkgs-de5233cf6126d0e8973ae1443a482bace34a5173.tar.lz nixpkgs-de5233cf6126d0e8973ae1443a482bace34a5173.tar.xz nixpkgs-de5233cf6126d0e8973ae1443a482bace34a5173.tar.zst nixpkgs-de5233cf6126d0e8973ae1443a482bace34a5173.zip |
givaro: backport gcc-13 build fix
Without the change `givaro` build on `gcc-13` fails as: /givaro/givdegree.h:42:33: error: 'uint64_t' does not name a type 42 | Degree operator*( const uint64_t& e) const { return Degree(_deg*e); } | ^~~~~~~~ /givaro/givdegree.h:23:1: note: 'uint64_t' is defined in header '<cstdint>'; this is probably fixable by adding '#include <cstdint>' 22 | #include <iostream> +++ |+#include <cstdint>
-rw-r--r-- | pkgs/development/libraries/givaro/default.nix | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/development/libraries/givaro/default.nix index 5f9f49f239d..c38419bed52 100644 --- a/pkgs/development/libraries/givaro/default.nix +++ b/pkgs/development/libraries/givaro/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, automake, autoconf, libtool, autoreconfHook, gmpxx }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, automake +, autoconf +, libtool +, autoreconfHook +, gmpxx +}: stdenv.mkDerivation rec { pname = "givaro"; version = "4.2.0"; @@ -8,6 +17,15 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "sha256-KR0WJc0CSvaBnPRott4hQJhWNBb/Wi6MIhcTExtVobQ="; }; + patches = [ + # Pull upstream fix for gcc-13: + # https://github.com/linbox-team/givaro/pull/218 + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/linbox-team/givaro/commit/c7744bb133496cd7ac04688f345646d505e1bf52.patch"; + hash = "sha256-aAA5o8Va10v0Pqgcpx7qM0TAZiNQgXoR6N9xecj7tDA="; + }) + ]; enableParallelBuilding = true; |