diff options
| author | Anderson Torres <torres.anderson.85@protonmail.com> | 2024-03-27 17:09:40 -0300 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2024-04-22 09:39:42 +0200 |
| commit | eefd56e328b91836be01e199029808e7f4ad08f0 (patch) | |
| tree | 46b9cc0e417246903600b8b86a7a1fd8a2d8a2fa /pkgs/development/libraries/mesa | |
| parent | 7a73706daddc722477d4126b961746eda5986ec6 (diff) | |
mesa: reorder buildInputs
Since it "globally" calls `xorg`. Taken from PR #299572
Diffstat (limited to 'pkgs/development/libraries/mesa')
| -rw-r--r-- | pkgs/development/libraries/mesa/default.nix | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index b26936de9777a..7568ec0de1580 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -279,23 +279,24 @@ self = stdenv.mkDerivation { buildInputs = with xorg; [ expat glslang - llvmPackages.libllvm + libffi libglvnd - xorgproto + libvdpau + llvmPackages.libllvm + openssl + zstd + ] ++ (with xorg; [ libX11 libXext - libxcb - libXt libXfixes - libxshmfence libXrandr - libffi - libvdpau + libXt libXvMC libpthreadstubs - openssl - zstd - ] ++ lib.optionals withLibunwind [ + libxcb + libxshmfence + xorgproto + ]) ++ lib.optionals withLibunwind [ libunwind ] ++ [ python3Packages.python # for shebang @@ -305,8 +306,8 @@ self = stdenv.mkDerivation { ] ++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal - udev lm_sensors + udev ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [ elfutils ] ++ lib.optionals enableOpenCL [ @@ -353,10 +354,10 @@ self = stdenv.mkDerivation { wayland-scanner ]; - propagatedBuildInputs = with xorg; [ + propagatedBuildInputs = (with xorg; [ libXdamage libXxf86vm - ] ++ lib.optionals withLibdrm [ + ]) ++ lib.optionals withLibdrm [ libdrm ] ++ lib.optionals stdenv.isDarwin [ OpenGL |