waylandpp: 1.0.0 -> 1.0.1 (#438237)
This commit is contained in:
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
makeFontsConf,
|
||||
pkg-config,
|
||||
@@ -16,34 +15,22 @@
|
||||
graphviz,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "waylandpp";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NilsBrause";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-Dw2RnLLyhykikHps1in+euHksO+ERbATbfmbUFOJklg=";
|
||||
repo = "waylandpp";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-vKYKUXq5lmjQcZ0rD+b2O7N1iCVnpkpKd8Z/RTI083g=";
|
||||
};
|
||||
|
||||
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.cmakeFeature "CMAKE_INSTALL_DATADIR" (placeholder "dev"))
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
"-DWAYLAND_SCANNERPP=${buildPackages.waylandpp}/bin/wayland-scanner++"
|
||||
(lib.cmakeFeature "WAYLAND_SCANNERPP" "${buildPackages.waylandpp}/bin/wayland-scanner++")
|
||||
];
|
||||
|
||||
# Complains about not being able to find the fontconfig config file otherwise
|
||||
@@ -82,7 +69,7 @@ stdenv.mkDerivation rec {
|
||||
export XDG_CACHE_HOME="$(mktemp -d)"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Wayland C++ binding";
|
||||
mainProgram = "wayland-scanner++";
|
||||
homepage = "https://github.com/NilsBrause/waylandpp/";
|
||||
@@ -91,5 +78,6 @@ stdenv.mkDerivation rec {
|
||||
hpnd
|
||||
];
|
||||
maintainers = with lib.maintainers; [ minijackson ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user