mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 20:39:04 +02:00
xlibs.xlibs: remove
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:
parent
6521957bf4
commit
0c74f18e4c
|
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||||
libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec
|
libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec
|
||||||
udev gnutls avahi libcddb SDL SDL_image libmtp unzip taglib
|
udev gnutls avahi libcddb SDL SDL_image libmtp unzip taglib
|
||||||
libkate libtiger libv4l samba liboggz libass libdvbpsi libva
|
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
|
libdc1394 libraw1394 libopus libebml libmatroska libvdpau
|
||||||
]
|
]
|
||||||
++ (if withQt5 then with qt5; [ base ] else [qt4])
|
++ (if withQt5 then with qt5; [ base ] else [qt4])
|
||||||
|
|
|
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
[ xineLib libpng readline ncurses curl lirc libjpeg
|
[ 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
|
xlibs.libXinerama xlibs.libXi xlibs.libXft
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig intltool ];
|
nativeBuildInputs = [ pkgconfig intltool ];
|
||||||
buildInputs =
|
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 ];
|
propagatedBuildInputs = [ libgnome libbonoboui libgnomecanvas gnome_vfs ];
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{ stdenv, fetchurl, fetchpatch, pkgconfig, libiconv, libintlOrEmpty
|
{ stdenv, fetchurl, fetchpatch, pkgconfig, libiconv, libintlOrEmpty
|
||||||
, expat, zlib, libpng, pixman, fontconfig, freetype, xlibs
|
, expat, zlib, libpng, pixman, fontconfig, freetype, xorg
|
||||||
, gobjectSupport ? true, glib
|
, gobjectSupport ? true, glib
|
||||||
, xcbSupport ? true # no longer experimental since 1.12
|
, xcbSupport ? true # no longer experimental since 1.12
|
||||||
, glSupport ? true, mesa_noglu ? null # mesa is no longer a big dependency
|
, glSupport ? true, mesa_noglu ? null # mesa is no longer a big dependency
|
||||||
|
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||||
nativeBuildInputs = [ pkgconfig libiconv ] ++ libintlOrEmpty;
|
nativeBuildInputs = [ pkgconfig libiconv ] ++ libintlOrEmpty;
|
||||||
|
|
||||||
propagatedBuildInputs =
|
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
|
++ optional (!stdenv.isDarwin) libXrender
|
||||||
++ optionals xcbSupport [ libxcb xcbutil ]
|
++ optionals xcbSupport [ libxcb xcbutil ]
|
||||||
++ optional gobjectSupport glib
|
++ optional gobjectSupport glib
|
||||||
|
|
|
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
||||||
# can't build alsaLib on darwin
|
# can't build alsaLib on darwin
|
||||||
++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib
|
++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib
|
||||||
++ stdenv.lib.optionals (!minimalDeps)
|
++ stdenv.lib.optionals (!minimalDeps)
|
||||||
[ xlibs.xlibs xlibs.libXv libogg libtheora libvorbis freetype pango
|
[ xlibs.xlibsWrapper xlibs.libXv libogg libtheora libvorbis freetype pango
|
||||||
liboil ]
|
liboil ]
|
||||||
# can't build cdparanoia on darwin
|
# can't build cdparanoia on darwin
|
||||||
++ stdenv.lib.optional (!minimalDeps && !stdenv.isDarwin) cdparanoia
|
++ stdenv.lib.optional (!minimalDeps && !stdenv.isDarwin) cdparanoia
|
||||||
|
|
|
@ -7,7 +7,7 @@ stdenv.mkDerivation {
|
||||||
sha256 = "11i5z8l5v5ffihif35k5j8igj0rahsk4jdmsj24xhdw2s0zx53kn";
|
sha256 = "11i5z8l5v5ffihif35k5j8igj0rahsk4jdmsj24xhdw2s0zx53kn";
|
||||||
};
|
};
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
pkgconfig glib xlibs.xlibs xlibs.libXdamage xlibs.libXcomposite
|
pkgconfig glib xlibs.xlibsWrapper xlibs.libXdamage xlibs.libXcomposite
|
||||||
xlibs.libXtst xlibs.inputproto
|
xlibs.libXtst xlibs.inputproto
|
||||||
# !!! inputproto should really be propagated by libXtst
|
# !!! inputproto should really be propagated by libXtst
|
||||||
];
|
];
|
||||||
|
|
|
@ -20,7 +20,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
|
||||||
nativeBuildInputs = toBuildInputs pkgArches (pkgs: (with pkgs; [
|
nativeBuildInputs = toBuildInputs pkgArches (pkgs: (with pkgs; [
|
||||||
freetype fontconfig mesa mesa_noglu.osmesa libdrm libpng libjpeg openssl gnutls cups ncurses
|
freetype fontconfig mesa mesa_noglu.osmesa libdrm libpng libjpeg openssl gnutls cups ncurses
|
||||||
]) ++ (with pkgs.xlibs; [
|
]) ++ (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
|
# Wine locates a lot of libraries dynamically through dlopen(). Add
|
||||||
|
|
|
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "1flqcqfs75wg74hr5w85n6w8b26l4qrpwzi7fzylnry67yzf94y5";
|
sha256 = "1flqcqfs75wg74hr5w85n6w8b26l4qrpwzi7fzylnry67yzf94y5";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [pkgconfig expat zlib libpng libjpeg xlibs.xlibs xlibs.libXv];
|
buildInputs = [pkgconfig expat zlib libpng libjpeg xlibs.xlibsWrapper xlibs.libXv];
|
||||||
|
|
||||||
preInstall = ''
|
preInstall = ''
|
||||||
installFlags=GNOME_DATADIR=$out
|
installFlags=GNOME_DATADIR=$out
|
||||||
|
|
|
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
|
||||||
++ lib.optionals (!libOnly) (
|
++ lib.optionals (!libOnly) (
|
||||||
[ libasyncns webrtc-audio-processing ]
|
[ libasyncns webrtc-audio-processing ]
|
||||||
++ lib.optional jackaudioSupport libjack2
|
++ 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.optional useSystemd systemd
|
||||||
++ lib.optionals stdenv.isLinux [ alsaLib udev ]
|
++ lib.optionals stdenv.isLinux [ alsaLib udev ]
|
||||||
++ lib.optional airtunesSupport openssl
|
++ lib.optional airtunesSupport openssl
|
||||||
|
|
|
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||||
buildInputs =
|
buildInputs =
|
||||||
[ pkgconfig libpng libjpeg expat libXaw yacc libtool fontconfig
|
[ pkgconfig libpng libjpeg expat libXaw yacc libtool fontconfig
|
||||||
pango gd gts
|
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;
|
++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext;
|
||||||
|
|
||||||
CPPFLAGS = stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") "-I${cairo}/include/cairo";
|
CPPFLAGS = stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") "-I${cairo}/include/cairo";
|
||||||
|
|
|
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
[ pkgconfig libpng libjpeg expat yacc libtool fontconfig gd gts libdevil flex
|
[ 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;
|
++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext;
|
||||||
|
|
||||||
CPPFLAGS = stdenv.lib.optionalString (xlibs != null && stdenv.system == "x86_64-darwin")
|
CPPFLAGS = stdenv.lib.optionalString (xlibs != null && stdenv.system == "x86_64-darwin")
|
||||||
|
|
|
@ -189,7 +189,7 @@ let
|
||||||
# old modular X libraries project (called `xlibs') but now it's just
|
# 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
|
# the set of packages in the modular X.org tree (which also includes
|
||||||
# non-library components like the server, drivers, fonts, etc.).
|
# non-library components like the server, drivers, fonts, etc.).
|
||||||
xlibs = xorg // {xlibs = xlibsWrapper;};
|
xlibs = xorg;
|
||||||
|
|
||||||
|
|
||||||
### Helper functions.
|
### Helper functions.
|
||||||
|
@ -8350,6 +8350,7 @@ let
|
||||||
|
|
||||||
xercesc = callPackage ../development/libraries/xercesc {};
|
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 {
|
xlibsWrapper = callPackage ../development/libraries/xlibs-wrapper {
|
||||||
packages = [
|
packages = [
|
||||||
freetype fontconfig xlibs.xproto xlibs.libX11 xlibs.libXt
|
freetype fontconfig xlibs.xproto xlibs.libX11 xlibs.libXt
|
||||||
|
@ -9219,7 +9220,7 @@ let
|
||||||
mesa = mesa_noglu;
|
mesa = mesa_noglu;
|
||||||
udev = if stdenv.isLinux then udev else null;
|
udev = if stdenv.isLinux then udev else null;
|
||||||
libdrm = if stdenv.isLinux then libdrm else null;
|
libdrm = if stdenv.isLinux then libdrm else null;
|
||||||
});
|
} // { inherit xlibsWrapper; } );
|
||||||
|
|
||||||
xorgReplacements = callPackage ../servers/x11/xorg/replacements.nix { };
|
xorgReplacements = callPackage ../servers/x11/xorg/replacements.nix { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue