diff options
| author | Simonas Kazlauskas <git@kazlauskas.me> | 2020-05-27 17:41:25 +0300 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-05-27 17:59:56 +0000 |
| commit | 62e6d73a09870174a891d2a8d29a38e62b05efd5 (patch) | |
| tree | c722134232c8b4adf7a29566397f095fc77b9b1d | |
| parent | f005272623abfb9eb470b0317a9d18250daa3526 (diff) | |
| download | nixlib-62e6d73a09870174a891d2a8d29a38e62b05efd5.tar nixlib-62e6d73a09870174a891d2a8d29a38e62b05efd5.tar.gz nixlib-62e6d73a09870174a891d2a8d29a38e62b05efd5.tar.bz2 nixlib-62e6d73a09870174a891d2a8d29a38e62b05efd5.tar.lz nixlib-62e6d73a09870174a891d2a8d29a38e62b05efd5.tar.xz nixlib-62e6d73a09870174a891d2a8d29a38e62b05efd5.tar.zst nixlib-62e6d73a09870174a891d2a8d29a38e62b05efd5.zip | |
mesa: Fix cross build
| -rw-r--r-- | pkgs/development/libraries/mesa/default.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 7eb18dd31c1b..aa70e9e5a549 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch +{ stdenv, lib, fetchurl, fetchpatch, buildPackages , pkgconfig, intltool, ninja, meson , file, flex, bison, expat, libdrm, xorg, wayland, wayland-protocols, openssl , llvmPackages, libffi, libomxil-bellagio, libva-minimal @@ -73,6 +73,12 @@ stdenv.mkDerivation { }) ]; + postPatch = '' + substituteInPlace meson.build --replace \ + "find_program('pkg-config')" \ + "find_program('${buildPackages.pkg-config.targetPrefix}pkg-config')" + ''; + outputs = [ "out" "dev" "drivers" "osmesa" ]; # TODO: Figure out how to enable opencl without having a runtime dependency on clang @@ -112,10 +118,14 @@ stdenv.mkDerivation { ++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal ] ++ lib.optional withValgrind valgrind-light; + depsBuildBuild = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig meson ninja intltool bison flex file python3Packages.python python3Packages.Mako + ] ++ lib.optionals (elem "wayland" eglPlatforms) [ + wayland # For wayland-scanner during the build ]; propagatedBuildInputs = with xorg; [ |