diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-04-22 19:53:19 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-04-22 19:53:19 +0200 |
| commit | aa272d8e8269c72a34c04c2b8cf0390383d9e73d (patch) | |
| tree | f62044e6a4db30948e4d05ed4b82c0b08fd199b2 /pkgs/development | |
| parent | 8374a2a0eee41361d4af9d32460e4956dcbea61c (diff) | |
| download | nixpkgs-aa272d8e8269c72a34c04c2b8cf0390383d9e73d.tar nixpkgs-aa272d8e8269c72a34c04c2b8cf0390383d9e73d.tar.gz nixpkgs-aa272d8e8269c72a34c04c2b8cf0390383d9e73d.tar.bz2 nixpkgs-aa272d8e8269c72a34c04c2b8cf0390383d9e73d.tar.lz nixpkgs-aa272d8e8269c72a34c04c2b8cf0390383d9e73d.tar.xz nixpkgs-aa272d8e8269c72a34c04c2b8cf0390383d9e73d.tar.zst nixpkgs-aa272d8e8269c72a34c04c2b8cf0390383d9e73d.zip | |
waylandpp: fix after incorrect merge
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/waylandpp/default.nix | 8 |
1 files 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/"; |