treewide: s/xlibs/xorg/g (#36889)
This commit is contained in:
@@ -15,7 +15,7 @@
|
||||
, cairo
|
||||
, pango
|
||||
, gnome3
|
||||
, xlibs
|
||||
, xorg
|
||||
, libpng12
|
||||
, freetype
|
||||
, fontconfig
|
||||
@@ -143,11 +143,11 @@ let
|
||||
cairo
|
||||
pango
|
||||
gnome3.dconf
|
||||
xlibs.libX11
|
||||
xlibs.libXext
|
||||
xlibs.libXrender
|
||||
xlibs.libXinerama
|
||||
xlibs.libXfixes
|
||||
xorg.libX11
|
||||
xorg.libXext
|
||||
xorg.libXrender
|
||||
xorg.libXinerama
|
||||
xorg.libXfixes
|
||||
libpng12
|
||||
libidn
|
||||
zlib
|
||||
|
||||
@@ -9,7 +9,7 @@ let
|
||||
|
||||
mkLdPath = ps: lib.makeLibraryPath (with ps; [ qt4 dbus alsaLib ]);
|
||||
|
||||
deps = ps: (with ps; [ dbus zlib alsaLib fontconfig freetype libpng12 libjpeg ]) ++ (with ps.xlibs; [ libX11 libXext libXdamage libXrandr libXrender libXfixes libSM libXtst libXinerama]);
|
||||
deps = ps: (with ps; [ dbus zlib alsaLib fontconfig freetype libpng12 libjpeg ]) ++ (with ps.xorg; [ libX11 libXext libXdamage libXrandr libXrender libXfixes libSM libXtst libXinerama]);
|
||||
tvldpath32 = lib.makeLibraryPath (with pkgsi686Linux; [ qt4 "$out/share/teamviewer/tv_bin/wine" ] ++ deps pkgsi686Linux);
|
||||
tvldpath64 = lib.makeLibraryPath (deps pkgs);
|
||||
in
|
||||
|
||||
Reference in New Issue
Block a user