Merge pull request #285630 from trofi/crossguid-gcc-13-fix
crossguid: port to `gcc-13`
This commit is contained in:
commit
5f1127d94e
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, libuuid, unstableGitUpdater }:
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, libuuid, unstableGitUpdater }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "crossguid";
|
||||
@ -11,6 +11,16 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-37tKPDo4lukl/aaDWWSQYfsBNEnDjE7t6OnEZjBhcvQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix the build against gcc-13:
|
||||
# https://github.com/graeme-hill/crossguid/pull/67
|
||||
(fetchpatch {
|
||||
name = "gcc-13.patch";
|
||||
url = "https://github.com/graeme-hill/crossguid/commit/1eb9bea38c320b2b588635cffceaaa2a8d434780.patch";
|
||||
hash = "sha256-0qKZUeuNfc3gt+aFeaTt+IexO391GCdjS+9PVJmBKV4=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = lib.optional stdenv.isLinux libuuid;
|
||||
|
||||
|
@ -20878,7 +20878,7 @@ with pkgs;
|
||||
|
||||
crocoddyl = callPackage ../development/libraries/crocoddyl { };
|
||||
|
||||
crossguid = pin-to-gcc12-if-gcc13 (callPackage ../development/libraries/crossguid { });
|
||||
crossguid = callPackage ../development/libraries/crossguid { };
|
||||
|
||||
cryptopp = callPackage ../development/libraries/crypto++ { };
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user