public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages 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
Download Patch File Download Diff File Expand all files Collapse all files

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