diff options
| -rw-r--r-- | pkgs/development/libraries/waylandpp/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 15 insertions, 2 deletions
diff --git a/pkgs/development/libraries/waylandpp/default.nix b/pkgs/development/libraries/waylandpp/default.nix index c0b48ea17c6f5..551712f89f5f3 100644 --- a/pkgs/development/libraries/waylandpp/default.nix +++ b/pkgs/development/libraries/waylandpp/default.nix @@ -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) [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bdfb60fec1fac..518bf1496aea4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |