MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 00:08:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #169191 from minijackson/waylandpp-0.2.10

Browse source 
waylandpp: 0.2.9 -> 0.2.10
This commit is contained in:
Guillaume Girol 2022-04-29 19:31:47 +00:00 committed by GitHub
commit 2d5fe8b052
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/development/libraries/waylandpp/default.nix
View file

@ -9,6 +9,7 @@
, buildPackages , buildPackages
, docSupport ? true , docSupport ? true
, doxygen ? null , doxygen ? null
, graphviz ? null
}: }:
assert docSupport -> doxygen != null; assert docSupport -> doxygen != null;
@ -16,13 +17,13 @@ assert docSupport -> doxygen != null;
with lib; with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "waylandpp"; pname = "waylandpp";
version = "0.2.9"; version = "0.2.10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "NilsBrause"; owner = "NilsBrause";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-c7sayJjQaqJWso2enESBx6OUW9vxxsfuHFolYDIYlXw="; sha256 = "sha256-5/u6tp7/E4tjSfX+QJFmcUYdnyOgl9rB79PDE/SJH1o=";
}; };
cmakeFlags = [ cmakeFlags = [
@ -31,7 +32,7 @@ stdenv.mkDerivation rec {
"-DWAYLAND_SCANNERPP=${buildPackages.waylandpp}/bin/wayland-scanner++" "-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 ]; buildInputs = [ pugixml wayland libGL libffi ];
outputs = [ "bin" "dev" "lib" "out" ] ++ optionals docSupport [ "doc" "devman" ]; outputs = [ "bin" "dev" "lib" "out" ] ++ optionals docSupport [ "doc" "devman" ];

4
pkgs/top-level/all-packages.nix
View file

@ -20995,7 +20995,9 @@ with pkgs;
wayland-protocols = callPackage ../development/libraries/wayland/protocols.nix { }; 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 { }; wcslib = callPackage ../development/libraries/science/astronomy/wcslib { };