diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-09-15 10:32:57 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-09-15 11:59:33 +0200 |
commit | 0c74f18e4c3ac32af94a84df85c3e4ad1ad2a7b7 (patch) | |
tree | 775ac2949498971a493bb10c85d92ff4679a67eb /pkgs/misc | |
parent | 6521957bf4057806ca01efdd92406b41c10a38c2 (diff) | |
download | nixlib-0c74f18e4c3ac32af94a84df85c3e4ad1ad2a7b7.tar nixlib-0c74f18e4c3ac32af94a84df85c3e4ad1ad2a7b7.tar.gz nixlib-0c74f18e4c3ac32af94a84df85c3e4ad1ad2a7b7.tar.bz2 nixlib-0c74f18e4c3ac32af94a84df85c3e4ad1ad2a7b7.tar.lz nixlib-0c74f18e4c3ac32af94a84df85c3e4ad1ad2a7b7.tar.xz nixlib-0c74f18e4c3ac32af94a84df85c3e4ad1ad2a7b7.tar.zst nixlib-0c74f18e4c3ac32af94a84df85c3e4ad1ad2a7b7.zip |
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`.
Diffstat (limited to 'pkgs/misc')
-rw-r--r-- | pkgs/misc/emulators/wine/base.nix | 2 | ||||
-rw-r--r-- | pkgs/misc/screensavers/electricsheep/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index bf63340d35d0..db20d0aca19d 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -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 diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix index dca60f55af03..bbba28a58c27 100644 --- a/pkgs/misc/screensavers/electricsheep/default.nix +++ b/pkgs/misc/screensavers/electricsheep/default.nix @@ -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 |