diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-05-29 23:24:20 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-05-29 23:25:02 +0200 |
| commit | b7703655749df57dd5cbc84b89cc3be4bc7358bc (patch) | |
| tree | a3a84870d2fff43f9cce6abfc6f0961f0a5a156d /pkgs/applications/video | |
| parent | 971337a119d708d78a152f4d918694e7b5a2b7e8 (diff) | |
| download | nixlib-b7703655749df57dd5cbc84b89cc3be4bc7358bc.tar nixlib-b7703655749df57dd5cbc84b89cc3be4bc7358bc.tar.gz nixlib-b7703655749df57dd5cbc84b89cc3be4bc7358bc.tar.bz2 nixlib-b7703655749df57dd5cbc84b89cc3be4bc7358bc.tar.lz nixlib-b7703655749df57dd5cbc84b89cc3be4bc7358bc.tar.xz nixlib-b7703655749df57dd5cbc84b89cc3be4bc7358bc.tar.zst nixlib-b7703655749df57dd5cbc84b89cc3be4bc7358bc.zip | |
ReRevert Merge x-updates into master
This reverts commit ec3965d8d0b5594a9db11e6c9cd1c28d36e91cde. Conflicts (taken x-updates): pkgs/development/libraries/libgcrypt/default.nix pkgs/development/libraries/libgpg-error/default.nix pkgs/development/libraries/poppler/default.nix
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 db6bde782b99..4f2addcc99b0 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, x11, ming, dejagnu, python, perl +, glib, gtk, gtkglext, pangox_compat, 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 + dbus curl pkgconfig glib gtk gtkglext pangox_compat xulrunner makeWrapper ] |