diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-01-10 01:11:23 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-01-10 01:11:23 +0100 |
| commit | c8d05d8abadb244bc4e6cee75d450978d1f09a61 (patch) | |
| tree | 2d710425b8e3f78e84d5e46abb3397cb1b34ec18 /nixpkgs/pkgs/development/libraries/valhalla | |
| parent | ad899504860973e98351c922ecb934595f2c0f19 (diff) | |
| parent | 0ed96eed101462bf05e1e99e1bbadcd49b4eb302 (diff) | |
| download | nixlib-c8d05d8abadb244bc4e6cee75d450978d1f09a61.tar nixlib-c8d05d8abadb244bc4e6cee75d450978d1f09a61.tar.gz nixlib-c8d05d8abadb244bc4e6cee75d450978d1f09a61.tar.bz2 nixlib-c8d05d8abadb244bc4e6cee75d450978d1f09a61.tar.lz nixlib-c8d05d8abadb244bc4e6cee75d450978d1f09a61.tar.xz nixlib-c8d05d8abadb244bc4e6cee75d450978d1f09a61.tar.zst nixlib-c8d05d8abadb244bc4e6cee75d450978d1f09a61.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/valhalla')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/valhalla/default.nix | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/valhalla/default.nix b/nixpkgs/pkgs/development/libraries/valhalla/default.nix index bfd23747db0a..8ad3bb9c356c 100644 --- a/nixpkgs/pkgs/development/libraries/valhalla/default.nix +++ b/nixpkgs/pkgs/development/libraries/valhalla/default.nix @@ -36,6 +36,14 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/valhalla/valhalla/commit/e4845b68e8ef8de9eabb359b23bf34c879e21f2b.patch"; hash = "sha256-xCufmXHGj1JxaMwm64JT9FPY+o0+x4glfJSYLdvHI8U="; }) + + # Fix gcc-13 build: + # https://github.com/valhalla/valhalla/pull/4154 + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/valhalla/valhalla/commit/ed93f30272377cc6803533a1bb94fe81d14af81c.patch"; + hash = "sha256-w4pnOqk/Jj3unVuesE64QSecrUIVSqwK69t9xNVc4GA="; + }) ]; postPatch = '' |