waylandpp: 0.2.10 -> 1.0.0 (#172097)
This commit is contained in:
parent
7d9329f665
commit
288c3c6fbc
|
@ -1,6 +1,7 @@
|
||||||
{ lib, stdenv
|
{ lib, stdenv
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, cmake
|
, cmake
|
||||||
|
, makeFontsConf
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, pugixml
|
, pugixml
|
||||||
, wayland
|
, wayland
|
||||||
|
@ -8,22 +9,19 @@
|
||||||
, libffi
|
, libffi
|
||||||
, buildPackages
|
, buildPackages
|
||||||
, docSupport ? true
|
, docSupport ? true
|
||||||
, doxygen ? null
|
, doxygen
|
||||||
, graphviz ? null
|
, graphviz
|
||||||
}:
|
}:
|
||||||
|
|
||||||
assert docSupport -> doxygen != null;
|
|
||||||
|
|
||||||
with lib;
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "waylandpp";
|
pname = "waylandpp";
|
||||||
version = "0.2.10";
|
version = "1.0.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "NilsBrause";
|
owner = "NilsBrause";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-5/u6tp7/E4tjSfX+QJFmcUYdnyOgl9rB79PDE/SJH1o=";
|
hash = "sha256-Dw2RnLLyhykikHps1in+euHksO+ERbATbfmbUFOJklg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
|
@ -32,15 +30,23 @@ stdenv.mkDerivation rec {
|
||||||
"-DWAYLAND_SCANNERPP=${buildPackages.waylandpp}/bin/wayland-scanner++"
|
"-DWAYLAND_SCANNERPP=${buildPackages.waylandpp}/bin/wayland-scanner++"
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake pkg-config ] ++ optionals docSupport [ doxygen graphviz ];
|
# Complains about not being able to find the fontconfig config file otherwise
|
||||||
|
FONTCONFIG_FILE = lib.optional docSupport (makeFontsConf { fontDirectories = [ ]; });
|
||||||
|
|
||||||
|
nativeBuildInputs = [ cmake pkg-config ] ++ lib.optionals docSupport [ doxygen graphviz ];
|
||||||
buildInputs = [ pugixml wayland libGL libffi ];
|
buildInputs = [ pugixml wayland libGL libffi ];
|
||||||
|
|
||||||
outputs = [ "bin" "dev" "lib" "out" ] ++ optionals docSupport [ "doc" "devman" ];
|
outputs = [ "bin" "dev" "lib" "out" ] ++ lib.optionals docSupport [ "doc" "devman" ];
|
||||||
|
|
||||||
|
# Resolves the warning "Fontconfig error: No writable cache directories"
|
||||||
|
preBuild = ''
|
||||||
|
export XDG_CACHE_HOME="$(mktemp -d)"
|
||||||
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Wayland C++ binding";
|
description = "Wayland C++ binding";
|
||||||
homepage = "https://github.com/NilsBrause/waylandpp/";
|
homepage = "https://github.com/NilsBrause/waylandpp/";
|
||||||
license = with licenses; [ bsd2 hpnd ];
|
license = with lib.licenses; [ bsd2 hpnd ];
|
||||||
maintainers = with maintainers; [ minijackson ];
|
maintainers = with lib.maintainers; [ minijackson ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue