diff options
| author | Nick Cao <nickcao@nichi.co> | 2023-06-01 01:48:36 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-01 01:48:36 -0600 |
| commit | 06adb25e4776b6f9ed3450c331a0402c9cb6149f (patch) | |
| tree | 77f654c0e7a907db829906677603713e0497435f | |
| parent | 3074443cc918d12ef17227951b1c4e6b791fc5bc (diff) | |
| parent | de91fb29211e5aec6a1cdc4f6a61bd5583128d37 (diff) | |
| download | nixpkgs-06adb25e4776b6f9ed3450c331a0402c9cb6149f.tar nixpkgs-06adb25e4776b6f9ed3450c331a0402c9cb6149f.tar.gz nixpkgs-06adb25e4776b6f9ed3450c331a0402c9cb6149f.tar.bz2 nixpkgs-06adb25e4776b6f9ed3450c331a0402c9cb6149f.tar.lz nixpkgs-06adb25e4776b6f9ed3450c331a0402c9cb6149f.tar.xz nixpkgs-06adb25e4776b6f9ed3450c331a0402c9cb6149f.tar.zst nixpkgs-06adb25e4776b6f9ed3450c331a0402c9cb6149f.zip | |
Merge pull request #231603 from NickCao/mesa-demos-cross
mesa-demos: fix cross compilation, set strictDeps
| -rw-r--r-- | pkgs/tools/graphics/mesa-demos/default.nix | 54 |
1 files changed, 46 insertions, 8 deletions
diff --git a/pkgs/tools/graphics/mesa-demos/default.nix b/pkgs/tools/graphics/mesa-demos/default.nix index 7fdface04b6..0bc30c8773f 100644 --- a/pkgs/tools/graphics/mesa-demos/default.nix +++ b/pkgs/tools/graphics/mesa-demos/default.nix @@ -1,7 +1,23 @@ -{ lib, stdenv, fetchurl -, freeglut, glew, libGL, libGLU, libX11, libXext, mesa -, meson, ninja, pkg-config, wayland, wayland-protocols -, vulkan-loader, libxkbcommon, libdecor, glslang }: +{ lib +, stdenv +, fetchurl +, freeglut +, libGL +, libGLU +, libX11 +, libXext +, mesa +, meson +, ninja +, pkg-config +, wayland +, wayland-scanner +, wayland-protocols +, vulkan-loader +, libxkbcommon +, libdecor +, glslang +}: stdenv.mkDerivation rec { pname = "mesa-demos"; @@ -12,11 +28,33 @@ stdenv.mkDerivation rec { sha256 = "sha256-MEaj0mp7BRr3690lel8jv+sWDK1u2VIynN/x6fHtSWs="; }; + strictDeps = true; + + depsBuildBuild = [ + pkg-config + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wayland-scanner + glslang + ]; + buildInputs = [ - freeglut glew libX11 libXext libGL libGLU mesa wayland - wayland-protocols vulkan-loader libxkbcommon libdecor glslang - ] ++ lib.optional (mesa ? osmesa) mesa.osmesa ; - nativeBuildInputs = [ meson ninja pkg-config wayland ]; + freeglut + libX11 + libXext + libGL + libGLU + mesa + wayland + wayland-protocols + vulkan-loader + libxkbcommon + libdecor + ] ++ lib.optional (mesa ? osmesa) mesa.osmesa; mesonFlags = [ "-Degl=${if stdenv.isDarwin then "disabled" else "auto"}" |