diff options
author | Anderson Torres <torres.anderson.85@protonmail.com> | 2024-03-03 15:09:06 -0300 |
---|---|---|
committer | Anderson Torres <torres.anderson.85@protonmail.com> | 2024-03-27 16:58:51 -0300 |
commit | 9a86e0f0754071421edb81a57a95dbb0e087f57a (patch) | |
tree | 3d5b60a958afd87a733f7a572f23dfdf4da69a54 /pkgs/development/libraries/mesa | |
parent | 4a25e78d56d6c002fcfe5d45cf6a7ffbf566a90b (diff) |
mesa: reorder lists
One element per line, no reorder.
Diffstat (limited to 'pkgs/development/libraries/mesa')
-rw-r--r-- | pkgs/development/libraries/mesa/default.nix | 83 |
1 files changed, 64 insertions, 19 deletions
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 86b575b1bcdea..df4d1fce3c63b 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -282,21 +282,49 @@ self = stdenv.mkDerivation { strictDeps = true; buildInputs = with xorg; [ - expat glslang llvmPackages.libllvm libglvnd xorgproto - libX11 libXext libxcb libXt libXfixes libxshmfence libXrandr - libffi libvdpau libXvMC - libpthreadstubs openssl + expat + glslang + llvmPackages.libllvm + libglvnd + xorgproto + libX11 + libXext + libxcb + libXt + libXfixes + libxshmfence + libXrandr + libffi + libvdpau + libXvMC + libpthreadstubs + openssl zstd ] ++ lib.optionals withLibunwind [ libunwind ] ++ [ python3Packages.python # for shebang - ] ++ lib.optionals haveWayland [ wayland wayland-protocols ] - ++ lib.optionals stdenv.isLinux [ elfutils libomxil-bellagio libva-minimal udev lm_sensors ] - ++ lib.optionals enableOpenCL [ llvmPackages.libclc llvmPackages.clang llvmPackages.clang-unwrapped spirv-llvm-translator ] - ++ lib.optionals withValgrind [ valgrind-light ] - ++ lib.optionals haveZink [ vulkan-loader ] - ++ lib.optionals haveDozen [ directx-headers ]; + ] ++ lib.optionals haveWayland [ + wayland + wayland-protocols + ] ++ lib.optionals stdenv.isLinux [ + elfutils + libomxil-bellagio + libva-minimal + udev + lm_sensors + ] ++ lib.optionals enableOpenCL [ + llvmPackages.libclc + llvmPackages.clang + llvmPackages.clang-unwrapped + spirv-llvm-translator + ] ++ lib.optionals withValgrind [ + valgrind-light + ] ++ lib.optionals haveZink [ + vulkan-loader + ] ++ lib.optionals haveDozen [ + directx-headers + ]; depsBuildBuild = [ pkg-config @@ -310,17 +338,34 @@ self = stdenv.mkDerivation { ]; nativeBuildInputs = [ - meson pkg-config ninja - intltool bison flex file - python3Packages.python python3Packages.mako python3Packages.ply - jdupes glslang - rustc rust-bindgen rustPlatform.bindgenHook - ] ++ lib.optionals haveWayland [ wayland-scanner ]; + meson + pkg-config + ninja + intltool + bison + flex + file + python3Packages.python + python3Packages.mako + python3Packages.ply + jdupes + glslang + rustc + rust-bindgen + rustPlatform.bindgenHook + ] ++ lib.optionals haveWayland [ + wayland-scanner + ]; propagatedBuildInputs = with xorg; [ - libXdamage libXxf86vm - ] ++ lib.optionals withLibdrm [ libdrm ] - ++ lib.optionals stdenv.isDarwin [ OpenGL Xplugin ]; + libXdamage + libXxf86vm + ] ++ lib.optionals withLibdrm [ + libdrm + ] ++ lib.optionals stdenv.isDarwin [ + OpenGL + Xplugin + ]; doCheck = false; |