JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #285630 from trofi/crossguid-gcc-13-fix

Browse Source 
crossguid: port to `gcc-13`
This commit is contained in:
Nick Cao 2024-02-02 10:07:47 -05:00 committed by GitHub
commit 5f1127d94e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/crossguid/default.nix
View File

@ -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;

2
pkgs/top-level/all-packages.nix
View File

@ -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++ { };