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/applications/video | |
| 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/applications/video')
| -rw-r--r-- | pkgs/applications/video/gnash/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix index 4f2addcc99b0..db6bde782b99 100644 --- a/pkgs/applications/video/gnash/default.nix +++ b/pkgs/applications/video/gnash/default.nix @@ -3,7 +3,7 @@ , gst_ffmpeg, speex , libogg, libxml2, libjpeg, mesa, libpng, libungif, libtool , boost, freetype, agg, dbus, curl, pkgconfig, gettext -, glib, gtk, gtkglext, pangox_compat, x11, ming, dejagnu, python, perl +, glib, gtk, gtkglext, x11, ming, dejagnu, python, perl , freefont_ttf, haxe, swftools , lib, makeWrapper , xulrunner }: @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { gettext x11 SDL SDL_mixer gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg speex libtool libogg libxml2 libjpeg mesa libpng libungif boost freetype agg - dbus curl pkgconfig glib gtk gtkglext pangox_compat + dbus curl pkgconfig glib gtk gtkglext xulrunner makeWrapper ] |