public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: xlibs -> xorg

Browse Source 
Fix building with `config.allowAliases = false;`.
This commit is contained in:
Samuel Gräfenstein 2021-03-16 19:16:31 +01:00
parent 052c06bf05
commit 6b6d2abfa0
No known key found for this signature in database
GPG Key ID: EF76A063F15C63C8
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/misc/bemenu/default.nix
View File

@ -2,12 +2,12 @@
, pango, fribidi, harfbuzz, pcre, pkg-config , pango, fribidi, harfbuzz, pcre, pkg-config
, ncursesSupport ? true, ncurses ? null , ncursesSupport ? true, ncurses ? null
, waylandSupport ? true, wayland ? null, wayland-protocols ? null , waylandSupport ? true, wayland ? null, wayland-protocols ? null
, x11Support ? true, xlibs ? null, xorg ? null , x11Support ? true, xorg ? null
}: }:
assert ncursesSupport -> ncurses != null; assert ncursesSupport -> ncurses != null;
assert waylandSupport -> ! lib.elem null [wayland wayland-protocols]; assert waylandSupport -> ! lib.elem null [wayland wayland-protocols];
assert x11Support -> xlibs != null && xorg != null; assert x11Support -> xorg != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bemenu"; pname = "bemenu";
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
] ++ optional ncursesSupport ncurses ] ++ optional ncursesSupport ncurses
++ optionals waylandSupport [ wayland wayland-protocols ] ++ optionals waylandSupport [ wayland wayland-protocols ]
++ optionals x11Support [ ++ optionals x11Support [
xlibs.libX11 xlibs.libXinerama xlibs.libXft xorg.libX11 xorg.libXinerama xorg.libXft
xorg.libXdmcp xorg.libpthreadstubs xorg.libxcb xorg.libXdmcp xorg.libpthreadstubs xorg.libxcb
]; ];

2
pkgs/applications/misc/marktext/default.nix
View File

@ -25,7 +25,7 @@ appimageTools.wrapType2 rec {
multiPkgs = null; # no 32bit needed multiPkgs = null; # no 32bit needed
extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [
p.libsecret p.libsecret
p.xlibs.libxkbfile p.xorg.libxkbfile
]; ];
# Strip version from binary name. # Strip version from binary name.

20
pkgs/development/mobile/androidenv/emulator.nix
View File

@ -5,16 +5,16 @@ deployAndroidPackage {
buildInputs = [ autoPatchelfHook makeWrapper ] buildInputs = [ autoPatchelfHook makeWrapper ]
++ lib.optional (os == "linux") [ ++ lib.optional (os == "linux") [
pkgs.glibc pkgs.glibc
pkgs.xlibs.libX11 pkgs.xorg.libX11
pkgs.xlibs.libXext pkgs.xorg.libXext
pkgs.xlibs.libXdamage pkgs.xorg.libXdamage
pkgs.xlibs.libXfixes pkgs.xorg.libXfixes
pkgs.xlibs.libxcb pkgs.xorg.libxcb
pkgs.xlibs.libXcomposite pkgs.xorg.libXcomposite
pkgs.xlibs.libXcursor pkgs.xorg.libXcursor
pkgs.xlibs.libXi pkgs.xorg.libXi
pkgs.xlibs.libXrender pkgs.xorg.libXrender
pkgs.xlibs.libXtst pkgs.xorg.libXtst
pkgs.libcxx pkgs.libcxx
pkgs.libGL pkgs.libGL
pkgs.libpulseaudio pkgs.libpulseaudio

4
pkgs/development/mobile/androidenv/tools/26.nix
View File

@ -4,7 +4,7 @@ deployAndroidPackage {
name = "androidsdk"; name = "androidsdk";
inherit os package; inherit os package;
buildInputs = [ autoPatchelfHook makeWrapper ] buildInputs = [ autoPatchelfHook makeWrapper ]
++ 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 ]; ++ 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 ];
patchInstructions = '' patchInstructions = ''
${lib.optionalString (os == "linux") '' ${lib.optionalString (os == "linux") ''
@ -27,7 +27,7 @@ deployAndroidPackage {
# Wrap monitor script # Wrap monitor script
wrapProgram $PWD/monitor \ wrapProgram $PWD/monitor \
--prefix PATH : ${pkgs.jdk8}/bin \ --prefix PATH : ${pkgs.jdk8}/bin \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.xlibs.libX11 pkgs.xlibs.libXtst ]} --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.xorg.libX11 pkgs.xorg.libXtst ]}
# Patch all script shebangs # Patch all script shebangs
patchShebangs . patchShebangs .