From a11d4f674628c8ed1209529deabcfadadd6217b8 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Mon, 18 Apr 2022 13:11:01 +0200 Subject: [PATCH] waylandpp: 0.2.9 -> 0.2.10 added graphviz for doxygen --- pkgs/development/libraries/waylandpp/default.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/waylandpp/default.nix b/pkgs/development/libraries/waylandpp/default.nix index 49e0e01872f5..30976e46bf1f 100644 --- a/pkgs/development/libraries/waylandpp/default.nix +++ b/pkgs/development/libraries/waylandpp/default.nix @@ -9,6 +9,7 @@ , buildPackages , docSupport ? true , doxygen ? null +, graphviz ? null }: assert docSupport -> doxygen != null; @@ -16,13 +17,13 @@ assert docSupport -> doxygen != null; with lib; stdenv.mkDerivation rec { pname = "waylandpp"; - version = "0.2.9"; + version = "0.2.10"; src = fetchFromGitHub { owner = "NilsBrause"; repo = pname; rev = version; - sha256 = "sha256-c7sayJjQaqJWso2enESBx6OUW9vxxsfuHFolYDIYlXw="; + sha256 = "sha256-5/u6tp7/E4tjSfX+QJFmcUYdnyOgl9rB79PDE/SJH1o="; }; cmakeFlags = [ @@ -31,7 +32,7 @@ stdenv.mkDerivation rec { "-DWAYLAND_SCANNERPP=${buildPackages.waylandpp}/bin/wayland-scanner++" ]; - nativeBuildInputs = [ cmake pkg-config ] ++ optional docSupport doxygen; + nativeBuildInputs = [ cmake pkg-config ] ++ optionals docSupport [ doxygen graphviz ]; buildInputs = [ pugixml wayland libGL libffi ]; outputs = [ "bin" "dev" "lib" "out" ] ++ optionals docSupport [ "doc" "devman" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f4fc54285df..1618a8fa840e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20874,7 +20874,9 @@ with pkgs; wayland-protocols = callPackage ../development/libraries/wayland/protocols.nix { }; - waylandpp = callPackage ../development/libraries/waylandpp { }; + waylandpp = callPackage ../development/libraries/waylandpp { + graphviz = graphviz-nox; + }; wcslib = callPackage ../development/libraries/science/astronomy/wcslib { };