From aa272d8e8269c72a34c04c2b8cf0390383d9e73d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 22 Apr 2020 19:53:19 +0200 Subject: waylandpp: fix after incorrect merge --- pkgs/development/libraries/waylandpp/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/waylandpp/default.nix b/pkgs/development/libraries/waylandpp/default.nix index 07de374c962..5b02ce826ad 100644 --- a/pkgs/development/libraries/waylandpp/default.nix +++ b/pkgs/development/libraries/waylandpp/default.nix @@ -25,15 +25,17 @@ stdenv.mkDerivation rec { sha256 = "1r4m0xhvwpcqxrqvp3hz1bzlkxqj2jiymd5r6hj8xjzz536hyprz"; }; - cmakeFlags = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DWAYLAND_SCANNERPP=${buildPackages.waylandpp}/bin/wayland-scanner++"; + cmakeFlags = [ + "-DCMAKE_INSTALL_DATADIR=${placeholder "dev"}" + ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DWAYLAND_SCANNERPP=${buildPackages.waylandpp}/bin/wayland-scanner++" + ]; nativeBuildInputs = [ cmake pkgconfig ] ++ optional docSupport doxygen; buildInputs = [ pugixml wayland libGL libffi ]; outputs = [ "bin" "dev" "lib" "out" ] ++ optionals docSupport [ "doc" "devman" ]; - cmakeFlags = [ "-DCMAKE_INSTALL_DATADIR=${placeholder "dev"}" ]; - meta = with stdenv.lib; { description = "Wayland C++ binding"; homepage = "https://github.com/NilsBrause/waylandpp/"; -- cgit 1.4.1