diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2020-04-13 16:48:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-13 16:48:38 -0400 |
| commit | e520d6af29158ff6d17c34ec16b1f2e79bccad45 (patch) | |
| tree | ddf031dda697cba7549ed8357ca3454c30433fbd /pkgs/development/libraries/waylandpp | |
| parent | 940c35568bc2fa135eafe0817027c765d9840469 (diff) | |
| parent | c6ff360cc437d366c10f2f827edd5a7fb47e73c3 (diff) | |
| download | nixpkgs-e520d6af29158ff6d17c34ec16b1f2e79bccad45.tar nixpkgs-e520d6af29158ff6d17c34ec16b1f2e79bccad45.tar.gz nixpkgs-e520d6af29158ff6d17c34ec16b1f2e79bccad45.tar.bz2 nixpkgs-e520d6af29158ff6d17c34ec16b1f2e79bccad45.tar.lz nixpkgs-e520d6af29158ff6d17c34ec16b1f2e79bccad45.tar.xz nixpkgs-e520d6af29158ff6d17c34ec16b1f2e79bccad45.tar.zst nixpkgs-e520d6af29158ff6d17c34ec16b1f2e79bccad45.zip | |
Merge pull request #84415 from matthewbauer/mb-cross-fixes-april2020
Cross compilation fixes [april 2020]
Diffstat (limited to 'pkgs/development/libraries/waylandpp')
| -rw-r--r-- | pkgs/development/libraries/waylandpp/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/libraries/waylandpp/default.nix b/pkgs/development/libraries/waylandpp/default.nix index 06faec558c0..59fac7bfe4a 100644 --- a/pkgs/development/libraries/waylandpp/default.nix +++ b/pkgs/development/libraries/waylandpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, pugixml, wayland, libGL }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, pugixml, wayland, libGL, libffi, buildPackages }: stdenv.mkDerivation rec { pname = "waylandpp"; @@ -11,8 +11,10 @@ stdenv.mkDerivation rec { sha256 = "16h57hzd688664qcyznzhjp3hxipdkzgv46x82yhkww24av8b55n"; }; + cmakeFlags = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DWAYLAND_SCANNERPP=${buildPackages.waylandpp}/bin/wayland-scanner++"; + nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ pugixml wayland libGL ]; + buildInputs = [ pugixml wayland libGL libffi ]; meta = with stdenv.lib; { description = "Wayland C++ binding"; |