diff options
| author | nixpkgs-ci[bot] <190413589+nixpkgs-ci[bot]@users.noreply.github.com> | 2026-01-26 18:08:53 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-01-26 18:08:53 +0000 |
| commit | 4f189086d0a6079752c4c535ea2e9ff6082fb86a (patch) | |
| tree | 7b16bdc043bd2167faaae118214903fd04ab2f00 /pkgs/development/interpreters | |
| parent | nixos-init: read required data from boot.json (#473273) (diff) | |
| parent | watchgha: 2.6.0 -> 2.7.0 (#483526) (diff) | |
| download | nixpkgs-4f189086d0a6079752c4c535ea2e9ff6082fb86a.tar.gz | |
Merge master into staging-nixos
Diffstat (limited to 'pkgs/development/interpreters')
5 files changed, 28 insertions, 29 deletions
diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 1ab41c655cad..5d6b0f3eb699 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -41,7 +41,7 @@ unixODBC, wrapGAppsHook3, wxGTK32, - xorg, + libx11, zlib, }: let @@ -59,7 +59,7 @@ let libGL libGLU wxGTK32 - xorg.libX11 + libx11 wrapGAppsHook3 ]; diff --git a/pkgs/development/interpreters/love/0.10.nix b/pkgs/development/interpreters/love/0.10.nix index ef0ba19d8071..fe0375b5e35c 100644 --- a/pkgs/development/interpreters/love/0.10.nix +++ b/pkgs/development/interpreters/love/0.10.nix @@ -19,7 +19,7 @@ autoconf, automake, libtool, - xorg, + libx11, }: stdenv.mkDerivation rec { @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ SDL2 - xorg.libX11 # SDl2 optional depend, for SDL_syswm.h + libx11 # SDl2 optional depend, for SDL_syswm.h libGLU libGL openal diff --git a/pkgs/development/interpreters/love/11.nix b/pkgs/development/interpreters/love/11.nix index e3ea4d9a6656..2fe0d4bedc31 100644 --- a/pkgs/development/interpreters/love/11.nix +++ b/pkgs/development/interpreters/love/11.nix @@ -18,7 +18,7 @@ libtheora, which, libtool, - xorg, + libx11, cmake, }: @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { libtool ] ++ lib.optionals stdenv.isLinux [ - xorg.libX11 # SDL2 optional depend, for SDL_syswm.h + libx11 # SDL2 optional depend, for SDL_syswm.h libGLU libGL ]; diff --git a/pkgs/development/interpreters/python/conda/default.nix b/pkgs/development/interpreters/python/conda/default.nix index 06421ff9b63a..a9c466b39ed2 100644 --- a/pkgs/development/interpreters/python/conda/default.nix +++ b/pkgs/development/interpreters/python/conda/default.nix @@ -5,25 +5,24 @@ # When installing a conda binary package, just extend # the `buildInputs` with `condaAutopatchLibs`. condaPatchelfLibs = map (p: p.lib or p) ( + with pkgs; [ - pkgs.alsa-lib - pkgs.cups - pkgs.gcc-unwrapped - pkgs.libGL + alsa-lib + cups + gcc-unwrapped + libGL + libsm + libice + libx11 + libxau + libxdamage + libxi + libxrender + libxrandr + libxcomposite + libxcursor + libxtst + libxscrnsaver ] - ++ (with pkgs.xorg; [ - libSM - libICE - libX11 - libXau - libXdamage - libXi - libXrender - libXrandr - libXcomposite - libXcursor - libXtst - libXScrnSaver - ]) ); } diff --git a/pkgs/development/interpreters/python/manylinux/default.nix b/pkgs/development/interpreters/python/manylinux/default.nix index 4b7110bab413..4b31ae915d17 100644 --- a/pkgs/development/interpreters/python/manylinux/default.nix +++ b/pkgs/development/interpreters/python/manylinux/default.nix @@ -54,11 +54,11 @@ let "libutil.so.1" = glibc; "libpthread.so.0" = glibc; "libresolv.so.2" = glibc; - "libX11.so.6" = xorg.libX11; - "libXext.so.6" = xorg.libXext; - "libXrender.so.1" = xorg.libXrender; - "libICE.so.6" = xorg.libICE; - "libSM.so.6" = xorg.libSM; + "libX11.so.6" = libx11; + "libXext.so.6" = libxext; + "libXrender.so.1" = libxrender; + "libICE.so.6" = libice; + "libSM.so.6" = libsm; "libGL.so.1" = libGL; "libgobject-2.0.so.0" = glib; "libgthread-2.0.so.0" = glib; |