ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-24 20:02:58 +03:00
Code Issues Projects Releases Wiki Activity

xlibs.xlibs: remove

Browse Source 
It was really ugly that `xlibs.xlibs` meant something else than `xlibs`,
especially when using `with xlibs`, such as in wine.
Also, now `xlibs` is the same as `xorg`.
This commit is contained in:
Vladimír Čunát 2015-09-15 10:32:57 +02:00
parent 6521957bf4
commit 0c74f18e4c
12 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/video/vlc/default.nix
View File

@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec
udev gnutls avahi libcddb SDL SDL_image libmtp unzip taglib
libkate libtiger libv4l samba liboggz libass libdvbpsi libva
xlibs.xlibs xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms
xlibs.xlibsWrapper xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms
libdc1394 libraw1394 libopus libebml libmatroska libvdpau
]
++ (if withQt5 then with qt5; [ base ] else [qt4])

2
pkgs/applications/video/xine-ui/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ xineLib libpng readline ncurses curl lirc libjpeg
xlibs.xlibs xlibs.libXext xlibs.libXv xlibs.libXxf86vm xlibs.libXtst xlibs.inputproto
xlibs.xlibsWrapper xlibs.libXext xlibs.libXv xlibs.libXxf86vm xlibs.libXtst xlibs.inputproto
xlibs.libXinerama xlibs.libXi xlibs.libXft
];

2
pkgs/desktops/gnome-2/platform/libgnomeui/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig intltool ];
buildInputs =
[ xlibs.xlibs libxml2 GConf pango glib libgnome_keyring libglade libtool ];
[ xlibs.xlibsWrapper libxml2 GConf pango glib libgnome_keyring libglade libtool ];
propagatedBuildInputs = [ libgnome libbonoboui libgnomecanvas gnome_vfs ];
}

4
pkgs/development/libraries/cairo/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, libiconv, libintlOrEmpty
, expat, zlib, libpng, pixman, fontconfig, freetype, xlibs
, expat, zlib, libpng, pixman, fontconfig, freetype, xorg
, gobjectSupport ? true, glib
, xcbSupport ? true # no longer experimental since 1.12
, glSupport ? true, mesa_noglu ? null # mesa is no longer a big dependency
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig libiconv ] ++ libintlOrEmpty;
propagatedBuildInputs =
with xlibs; [ xlibs.xlibs fontconfig expat freetype pixman zlib libpng ]
with xorg; [ xorg.xlibsWrapper fontconfig expat freetype pixman zlib libpng ]
++ optional (!stdenv.isDarwin) libXrender
++ optionals xcbSupport [ libxcb xcbutil ]
++ optional gobjectSupport glib

2
pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix
View File

@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
# can't build alsaLib on darwin
++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib
++ stdenv.lib.optionals (!minimalDeps)
[ xlibs.xlibs xlibs.libXv libogg libtheora libvorbis freetype pango
[ xlibs.xlibsWrapper xlibs.libXv libogg libtheora libvorbis freetype pango
liboil ]
# can't build cdparanoia on darwin
++ stdenv.lib.optional (!minimalDeps && !stdenv.isDarwin) cdparanoia

2
pkgs/development/libraries/libcm/default.nix
View File

@ -7,7 +7,7 @@ stdenv.mkDerivation {
sha256 = "11i5z8l5v5ffihif35k5j8igj0rahsk4jdmsj24xhdw2s0zx53kn";
};
buildInputs = [
pkgconfig glib xlibs.xlibs xlibs.libXdamage xlibs.libXcomposite
pkgconfig glib xlibs.xlibsWrapper xlibs.libXdamage xlibs.libXcomposite
xlibs.libXtst xlibs.inputproto
# !!! inputproto should really be propagated by libXtst
];

2
pkgs/misc/emulators/wine/base.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
nativeBuildInputs = toBuildInputs pkgArches (pkgs: (with pkgs; [
freetype fontconfig mesa mesa_noglu.osmesa libdrm libpng libjpeg openssl gnutls cups ncurses
]) ++ (with pkgs.xlibs; [
xlibs libXi libXcursor libXinerama libXrandr libXrender libXxf86vm libXcomposite
xlibsWrapper libXi libXcursor libXinerama libXrandr libXrender libXxf86vm libXcomposite
]));
# Wine locates a lot of libraries dynamically through dlopen(). Add

2
pkgs/misc/screensavers/electricsheep/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1flqcqfs75wg74hr5w85n6w8b26l4qrpwzi7fzylnry67yzf94y5";
};
buildInputs = [pkgconfig expat zlib libpng libjpeg xlibs.xlibs xlibs.libXv];
buildInputs = [pkgconfig expat zlib libpng libjpeg xlibs.xlibsWrapper xlibs.libXv];
preInstall = ''
installFlags=GNOME_DATADIR=$out

2
pkgs/servers/pulseaudio/default.nix
View File

@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
++ lib.optionals (!libOnly) (
[ libasyncns webrtc-audio-processing ]
++ lib.optional jackaudioSupport libjack2
++ lib.optionals x11Support [ xlibs.xlibs xlibs.libXtst xlibs.libXi ]
++ lib.optionals x11Support [ xlibs.xlibsWrapper xlibs.libXtst xlibs.libXi ]
++ lib.optional useSystemd systemd
++ lib.optionals stdenv.isLinux [ alsaLib udev ]
++ lib.optional airtunesSupport openssl

2
pkgs/tools/graphics/graphviz/2.32.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ pkgconfig libpng libjpeg expat libXaw yacc libtool fontconfig
pango gd gts
] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibs xlibs.libXrender ]
] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibsWrapper xlibs.libXrender ]
++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext;
CPPFLAGS = stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") "-I${cairo}/include/cairo";

2
pkgs/tools/graphics/graphviz/default.nix
View File

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ pkgconfig libpng libjpeg expat yacc libtool fontconfig gd gts libdevil flex
] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibs xlibs.libXrender pango libXaw ]
] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibsWrapper xlibs.libXrender pango libXaw ]
++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext;
CPPFLAGS = stdenv.lib.optionalString (xlibs != null && stdenv.system == "x86_64-darwin")

5
pkgs/top-level/all-packages.nix
View File

@ -189,7 +189,7 @@ let
# old modular X libraries project (called `xlibs') but now it's just
# the set of packages in the modular X.org tree (which also includes
# non-library components like the server, drivers, fonts, etc.).
xlibs = xorg // {xlibs = xlibsWrapper;};
xlibs = xorg;
### Helper functions.
@ -8350,6 +8350,7 @@ let
xercesc = callPackage ../development/libraries/xercesc {};
# Avoid using this. It isn't really a wrapper anymore, but we keep the name.
xlibsWrapper = callPackage ../development/libraries/xlibs-wrapper {
packages = [
freetype fontconfig xlibs.xproto xlibs.libX11 xlibs.libXt
@ -9219,7 +9220,7 @@ let
mesa = mesa_noglu;
udev = if stdenv.isLinux then udev else null;
libdrm = if stdenv.isLinux then libdrm else null;
});
} // { inherit xlibsWrapper; } );
xorgReplacements = callPackage ../servers/x11/xorg/replacements.nix { };