From d88318ee558014b26e3076f7edac8a832c808b5b Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sat, 30 Jan 2021 00:53:37 -0800 Subject: [PATCH] libdrm: fix cross-compile to x86 Don't omit drm_intel when cross-compiling. We've had this switch since ca5d91aa608224368d93599416dd97b16cbe6bbf and it doesn't seem to be needed anymore. https://hydra.nixos.org/eval/1644952?filter=x86_64-musl.mesa#tabs-still-fail --- pkgs/development/libraries/libdrm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index e575624f815..b4ba311165a 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.isAarch32 || stdenv.isAarch64) [ "-Dtegra=true" "-Detnaviv=true" - ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-Dintel=false"; + ]; meta = with lib; { homepage = "https://gitlab.freedesktop.org/mesa/drm";