diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-05-09 13:58:08 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-05-09 14:03:35 +0200 |
| commit | ec3965d8d0b5594a9db11e6c9cd1c28d36e91cde (patch) | |
| tree | 9bb0bc5ac4f3c6aaa170a9df5562f10e30ade47f /pkgs/misc/emulators | |
| parent | 84b0bf63b7f07dc1d9d19458dcbba6d02b4e2811 (diff) | |
| download | nixlib-ec3965d8d0b5594a9db11e6c9cd1c28d36e91cde.tar nixlib-ec3965d8d0b5594a9db11e6c9cd1c28d36e91cde.tar.gz nixlib-ec3965d8d0b5594a9db11e6c9cd1c28d36e91cde.tar.bz2 nixlib-ec3965d8d0b5594a9db11e6c9cd1c28d36e91cde.tar.lz nixlib-ec3965d8d0b5594a9db11e6c9cd1c28d36e91cde.tar.xz nixlib-ec3965d8d0b5594a9db11e6c9cd1c28d36e91cde.tar.zst nixlib-ec3965d8d0b5594a9db11e6c9cd1c28d36e91cde.zip | |
Revert Merge x-updates into master due to mesa bloat
See #490 discussion. This reverts commit 1278859d3167b9f84bfab680d9c8c463adf64a60, reversing changes made to 0c020c98f9d4f49d5c9907db5f4b35aac7df959b. Conflicts: pkgs/desktops/xfce/core/xfce4-session.nix (take master) pkgs/lib/misc.nix (auto)
Diffstat (limited to 'pkgs/misc/emulators')
| -rw-r--r-- | pkgs/misc/emulators/wine/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index b6013b5eb4d5..11402ca740f0 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, xlibs, flex, bison, mesa, alsaLib , ncurses, libpng, libjpeg, lcms, freetype, fontconfig, fontforge -, libxml2, libxslt, openssl, gnutls, cups, libdrm +, libxml2, libxslt, openssl, gnutls, cups }: assert stdenv.isLinux; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { # them to the RPATH so that the user doesn't have to set them in # LD_LIBRARY_PATH. NIX_LDFLAGS = map (path: "-rpath ${path}/lib ") [ - freetype fontconfig stdenv.gcc.gcc mesa libdrm + freetype fontconfig stdenv.gcc.gcc mesa mesa.libdrm xlibs.libXinerama xlibs.libXrender xlibs.libXrandr xlibs.libXcursor xlibs.libXcomposite libpng libjpeg openssl gnutls cups |