public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #84415 from matthewbauer/mb-cross-fixes-april2020

Browse Source 
Cross compilation fixes [april 2020]
This commit is contained in:
Matthew Bauer
2020-04-13 16:48:38 -04:00
committed by GitHub
parent 940c35568b c6ff360cc4
commit e520d6af29
36 changed files with 187 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/waylandpp/default.nix
+4 -2
View File
@@ -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";