diff options
-rw-r--r-- | pkgs/development/libraries/crossguid/default.nix | 12 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 12 insertions, 2 deletions
diff --git a/pkgs/development/libraries/crossguid/default.nix b/pkgs/development/libraries/crossguid/default.nix index bccba589e031..e8d85ec23dd5 100644 --- a/pkgs/development/libraries/crossguid/default.nix +++ b/pkgs/development/libraries/crossguid/default.nix @@ -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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e241c19a712f..a5840667a98f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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++ { }; |