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

Merge pull request #280679 from trofi/waylandpp-gcc-13-fix

Browse Source 
waylandpp: pull `gcc-13` fix pending upstream inclusion
This commit is contained in:
Weijia Wang 2024-01-13 18:31:32 +01:00 committed by GitHub
commit 8695ee22a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/libraries/waylandpp/default.nix
View File

@ -1,5 +1,6 @@
{ lib, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
, makeFontsConf
, pkg-config
@ -24,6 +25,18 @@ stdenv.mkDerivation rec {
hash = "sha256-Dw2RnLLyhykikHps1in+euHksO+ERbATbfmbUFOJklg=";
};
patches = [
# Pull fixes for gcc-13 compatibility:
# https://github.com/NilsBrause/waylandpp/pull/71
# Without the change `kodi` fails to find `uint32_t` in `waylandpp`
# headers.
(fetchpatch {
name = "gcc-13.patch";
url = "https://github.com/NilsBrause/waylandpp/commit/3c441910aa25f57df2a4db55f75f5d99cea86620.patch";
hash = "sha256-bxHMP09zCwUKD0M63C1FqQySAN9hr+7t/DyFDRwdtCo=";
})
];
cmakeFlags = [
"-DCMAKE_INSTALL_DATADIR=${placeholder "dev"}"
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [

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

@ -25548,9 +25548,9 @@ with pkgs;
wayland-protocols = callPackage ../development/libraries/wayland/protocols.nix { };
waylandpp = pin-to-gcc12-if-gcc13 (callPackage ../development/libraries/waylandpp {
waylandpp = callPackage ../development/libraries/waylandpp {
graphviz = graphviz-nox;
});
};
wcslib = callPackage ../development/libraries/science/astronomy/wcslib { };