diff --git a/pkgs/development/libraries/waylandpp/default.nix b/pkgs/development/libraries/waylandpp/default.nix index 30976e46bf1..c0b48ea17c6 100644 --- a/pkgs/development/libraries/waylandpp/default.nix +++ b/pkgs/development/libraries/waylandpp/default.nix @@ -1,6 +1,7 @@ { lib, stdenv , fetchFromGitHub , cmake +, makeFontsConf , pkg-config , pugixml , wayland @@ -8,22 +9,19 @@ , libffi , buildPackages , docSupport ? true -, doxygen ? null -, graphviz ? null +, doxygen +, graphviz }: -assert docSupport -> doxygen != null; - -with lib; stdenv.mkDerivation rec { pname = "waylandpp"; - version = "0.2.10"; + version = "1.0.0"; src = fetchFromGitHub { owner = "NilsBrause"; repo = pname; rev = version; - sha256 = "sha256-5/u6tp7/E4tjSfX+QJFmcUYdnyOgl9rB79PDE/SJH1o="; + hash = "sha256-Dw2RnLLyhykikHps1in+euHksO+ERbATbfmbUFOJklg="; }; cmakeFlags = [ @@ -32,15 +30,23 @@ stdenv.mkDerivation rec { "-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 ]; - 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; { description = "Wayland C++ binding"; homepage = "https://github.com/NilsBrause/waylandpp/"; - license = with licenses; [ bsd2 hpnd ]; - maintainers = with maintainers; [ minijackson ]; + license = with lib.licenses; [ bsd2 hpnd ]; + maintainers = with lib.maintainers; [ minijackson ]; }; }