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-17 00:00:18 +01:00
parent 052c06bf05
commit 6b6d2abfa0
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/misc/bemenu/default.nix
+3 -3
View File
@@ -2,12 +2,12 @@
, pango, fribidi, harfbuzz, pcre, pkg-config
, ncursesSupport ? true, ncurses ? null
, waylandSupport ? true, wayland ? null, wayland-protocols ? null
, x11Support ? true, xlibs ? null, xorg ? null
, x11Support ? true, xorg ? null
}:
assert ncursesSupport -> ncurses != null;
assert waylandSupport -> ! lib.elem null [wayland wayland-protocols];
assert x11Support -> xlibs != null && xorg != null;
assert x11Support -> xorg != null;
stdenv.mkDerivation rec {
pname = "bemenu";
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
] ++ optional ncursesSupport ncurses
++ optionals waylandSupport [ wayland wayland-protocols ]
++ optionals x11Support [
xlibs.libX11 xlibs.libXinerama xlibs.libXft
xorg.libX11 xorg.libXinerama xorg.libXft
xorg.libXdmcp xorg.libpthreadstubs xorg.libxcb
];