nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix

treewide: xlibs -> xorg

Fix building with `config.allowAliases = false;`.

+16 -16
+3 -3
pkgs/applications/misc/bemenu/default.nix
··· 2 2 , pango, fribidi, harfbuzz, pcre, pkg-config 3 3 , ncursesSupport ? true, ncurses ? null 4 4 , waylandSupport ? true, wayland ? null, wayland-protocols ? null 5 - , x11Support ? true, xlibs ? null, xorg ? null 5 + , x11Support ? true, xorg ? null 6 6 }: 7 7 8 8 assert ncursesSupport -> ncurses != null; 9 9 assert waylandSupport -> ! lib.elem null [wayland wayland-protocols]; 10 - assert x11Support -> xlibs != null && xorg != null; 10 + assert x11Support -> xorg != null; 11 11 12 12 stdenv.mkDerivation rec { 13 13 pname = "bemenu"; ··· 38 38 ] ++ optional ncursesSupport ncurses 39 39 ++ optionals waylandSupport [ wayland wayland-protocols ] 40 40 ++ optionals x11Support [ 41 - xlibs.libX11 xlibs.libXinerama xlibs.libXft 41 + xorg.libX11 xorg.libXinerama xorg.libXft 42 42 xorg.libXdmcp xorg.libpthreadstubs xorg.libxcb 43 43 ]; 44 44
+1 -1
pkgs/applications/misc/marktext/default.nix
··· 25 25 multiPkgs = null; # no 32bit needed 26 26 extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ 27 27 p.libsecret 28 - p.xlibs.libxkbfile 28 + p.xorg.libxkbfile 29 29 ]; 30 30 31 31 # Strip version from binary name.
+10 -10
pkgs/development/mobile/androidenv/emulator.nix
··· 5 5 buildInputs = [ autoPatchelfHook makeWrapper ] 6 6 ++ lib.optional (os == "linux") [ 7 7 pkgs.glibc 8 - pkgs.xlibs.libX11 9 - pkgs.xlibs.libXext 10 - pkgs.xlibs.libXdamage 11 - pkgs.xlibs.libXfixes 12 - pkgs.xlibs.libxcb 13 - pkgs.xlibs.libXcomposite 14 - pkgs.xlibs.libXcursor 15 - pkgs.xlibs.libXi 16 - pkgs.xlibs.libXrender 17 - pkgs.xlibs.libXtst 8 + pkgs.xorg.libX11 9 + pkgs.xorg.libXext 10 + pkgs.xorg.libXdamage 11 + pkgs.xorg.libXfixes 12 + pkgs.xorg.libxcb 13 + pkgs.xorg.libXcomposite 14 + pkgs.xorg.libXcursor 15 + pkgs.xorg.libXi 16 + pkgs.xorg.libXrender 17 + pkgs.xorg.libXtst 18 18 pkgs.libcxx 19 19 pkgs.libGL 20 20 pkgs.libpulseaudio
+2 -2
pkgs/development/mobile/androidenv/tools/26.nix
··· 4 4 name = "androidsdk"; 5 5 inherit os package; 6 6 buildInputs = [ autoPatchelfHook makeWrapper ] 7 - ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.xlibs.libX11 pkgs.xlibs.libXrender pkgs.xlibs.libXext pkgs.fontconfig pkgs.freetype pkgs_i686.glibc pkgs_i686.xlibs.libX11 pkgs_i686.xlibs.libXrender pkgs_i686.xlibs.libXext pkgs_i686.fontconfig.lib pkgs_i686.freetype pkgs_i686.zlib pkgs.fontconfig.lib ]; 7 + ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.xorg.libX11 pkgs.xorg.libXrender pkgs.xorg.libXext pkgs.fontconfig pkgs.freetype pkgs_i686.glibc pkgs_i686.xorg.libX11 pkgs_i686.xorg.libXrender pkgs_i686.xorg.libXext pkgs_i686.fontconfig.lib pkgs_i686.freetype pkgs_i686.zlib pkgs.fontconfig.lib ]; 8 8 9 9 patchInstructions = '' 10 10 ${lib.optionalString (os == "linux") '' ··· 27 27 # Wrap monitor script 28 28 wrapProgram $PWD/monitor \ 29 29 --prefix PATH : ${pkgs.jdk8}/bin \ 30 - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.xlibs.libX11 pkgs.xlibs.libXtst ]} 30 + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.xorg.libX11 pkgs.xorg.libXtst ]} 31 31 32 32 # Patch all script shebangs 33 33 patchShebangs .