diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-09-15 11:26:18 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-09-15 12:54:34 +0200 |
commit | 88c9f8b574ead01e32c5ee5228679723343cd52c (patch) | |
tree | 92196d2055a7842ae40c022581220bace87ab9e1 /pkgs/misc | |
parent | 21e3ff658ac2d7b7986169f31550aa5f65bb7635 (diff) |
xlibs: replace occurrences by xorg
This seems to have been confusing people, using both xlibs and xorg, etc. - Avoided renaming local (and different) xlibs binding in gcc*. - Fixed cases where both xorg and xlibs were used. Hopefully everything still works as before.
Diffstat (limited to 'pkgs/misc')
-rw-r--r-- | pkgs/misc/emulators/wine/base.nix | 2 | ||||
-rw-r--r-- | pkgs/misc/screensavers/electricsheep/default.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/themes/qtcurve/default.nix | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index db20d0aca19d1..1e2d656fb0ef0 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -19,7 +19,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; [ + ]) ++ (with pkgs.xorg; [ xlibsWrapper libXi libXcursor libXinerama libXrandr libXrender libXxf86vm libXcomposite ])); diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix index bbba28a58c278..27e26d6d5df75 100644 --- a/pkgs/misc/screensavers/electricsheep/default.nix +++ b/pkgs/misc/screensavers/electricsheep/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, expat, zlib, libpng, libjpeg, xlibs}: +{stdenv, fetchurl, pkgconfig, expat, zlib, libpng, libjpeg, xorg}: stdenv.mkDerivation rec { name = "electricsheep-2.6.8"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1flqcqfs75wg74hr5w85n6w8b26l4qrpwzi7fzylnry67yzf94y5"; }; - buildInputs = [pkgconfig expat zlib libpng libjpeg xlibs.xlibsWrapper xlibs.libXv]; + buildInputs = [pkgconfig expat zlib libpng libjpeg xorg.xlibsWrapper xorg.libXv]; preInstall = '' installFlags=GNOME_DATADIR=$out diff --git a/pkgs/misc/themes/qtcurve/default.nix b/pkgs/misc/themes/qtcurve/default.nix index e63f684600221..2aa73f1e0c174 100644 --- a/pkgs/misc/themes/qtcurve/default.nix +++ b/pkgs/misc/themes/qtcurve/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, gettext, pkgconfig # Build tools , gtk2, kde_workspace, kdelibs # Toolkit dependencies -, libpthreadstubs, libXdmcp, libxcb, xlibs # X11 dependencies +, libpthreadstubs, libXdmcp, libxcb, xorg # X11 dependencies }: stdenv.mkDerivation { @@ -20,7 +20,7 @@ stdenv.mkDerivation { libXdmcp libxcb pkgconfig - xlibs.libxshmfence + xorg.libxshmfence ]; patches = [ |