Commit Graph

132 Commits

Author SHA1 Message Date
Eelco Dolstra
7689a348c4 * Got rid of a lot of "postInstall=postInstall" and similar lines in
builders.  These are redundant now.
* Inlined some trivial builders.
* Removed a few explicit setup-hook creations.  This is done
  automatically now if setupHook is set.
* Deleted the initscripts package.  NixOS doesn't use it anymore.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15276
2009-04-23 13:31:10 +00:00
Eelco Dolstra
f762b50991 * Another sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15269
2009-04-23 11:59:43 +00:00
Eelco Dolstra
cee387e845 * Move the composition of Haskell packages out of all-packages.nix
into haskell-packages.nix, which depends on an instance of GHC.
  This allows a consistent set of packages to be built with the same
  GHC.  For instance,

  $ nix-build -A haskellPackages_ghc683.xmonad

  builds xmonad and all its dependencies with GHC 6.8.3, while

  $ nix-build -A haskellPackages_ghc6102.xmonad

  does the same with GHC 6.10.2.  This is the same technique used with
  kernelPackages.  It also means that we don't need things like
  "cabal682" and "cabal683" anymore.

* The setup hook is now in a separate wrapper package so that we don't
  have to recompile all of GHC every time we want to make a small
  change.

* cinelerra: this package appears to have an accidental dependency on
  the "X11" Haskell package.

svn path=/nixpkgs/trunk/; revision=15125
2009-04-18 12:47:11 +00:00
Eelco Dolstra
a4c304ef84 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15065
2009-04-15 13:25:01 +00:00
Lluís Batlle i Rossell
b8969ff4ae Making mplayer compile with mesa, so it gets 'gl' output.
svn path=/nixpkgs/trunk/; revision=15041
2009-04-14 21:01:16 +00:00
Eelco Dolstra
fd03290fc0 * Simplified the pthread_cancel fix a bit: you just need to use -lgcc_s.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15017
2009-04-13 17:07:20 +00:00
Eelco Dolstra
977e608a38 * xine-ui: put $gcc/lib in the RPATH, because otherwise it will barf
(on exit) with "libgcc_s.so.1 must be installed for pthread_cancel
  to work".

svn path=/nixpkgs/branches/stdenv-updates/; revision=14980
2009-04-09 15:27:48 +00:00
Eelco Dolstra
2eb05cf933 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14965
2009-04-09 12:19:57 +00:00
Eelco Dolstra
f6e7c5b326 * vlc 0.9.9.
svn path=/nixpkgs/trunk/; revision=14872
2009-04-03 20:25:23 +00:00
Eelco Dolstra
3593b97d63 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14557
2009-03-16 12:45:27 +00:00
Eelco Dolstra
8ac53703f0 * vlc: use faad.
svn path=/nixpkgs/trunk/; revision=14502
2009-03-10 23:28:06 +00:00
Eelco Dolstra
1485c905f7 * ffmpeg: build with faad2 support. However, vlc still won't play
mp4a audio.
* faad2: latest version.
* vlc: fix the hard-coded OSD font path name.  Dunno why they don't
  use fontconfig.

svn path=/nixpkgs/trunk/; revision=14501
2009-03-10 22:45:27 +00:00
Eelco Dolstra
44ac9e249c * MPlayer: updated to the SVN version.
* VLC: updated to 0.9.8a.  It now uses Qt for the GUI, which looks a
  lot better than the wxWidgets one.
* libdvdread, libdvdnav: updated to 4.1.3.
* ffmpeg: updated to 0.5 (a new release!).  Got rid of the SVN
  version, which shouldn't be necessary anymore.

svn path=/nixpkgs/trunk/; revision=14500
2009-03-10 21:03:51 +00:00
Ludovic Courtès
f301e8423b GNU Gnash 0.8.5.
svn path=/nixpkgs/trunk/; revision=14415
2009-03-06 14:24:27 +00:00
Eelco Dolstra
fcad0b0a5a * Cleaned up a lot of description fields that contained newlines.
Some of these should be longDescriptions, but most others just
  shouldn't contain newlines.  E.g. write

    description = "Bla";

  and not

    description = ''
      Bla
    '';

  This pollutes "nix-env -qa --description" output.

svn path=/nixpkgs/trunk/; revision=14310
2009-03-03 13:27:40 +00:00
Eelco Dolstra
ffe07e1507 * MPlayer: disabled ivtv since it doesn't build.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14104
2009-02-17 16:10:19 +00:00
Marc Weber
91f9300897 added dvdauthor
svn path=/nixpkgs/trunk/; revision=13766
2009-01-14 16:23:06 +00:00
Marc Weber
e996113be7 removed mkDerivationByConfiguration, using composableDerivation instead
qgis, vim_configurable both work now

svn path=/nixpkgs/trunk/; revision=13661
2008-12-20 01:20:35 +00:00
Eelco Dolstra
aa84bce64d * Get rid of all references to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=13299
2008-11-14 16:57:19 +00:00
Ludovic Courtès
9ec27e7dfd Gnash: Use gst-ffmpeg and set the right `GST_PLUGIN_PATH'.
This makes viewing YouTube videos work out-of-the-box!

svn path=/nixpkgs/trunk/; revision=13256
2008-11-12 08:37:39 +00:00
Eelco Dolstra
94a773eed3 * Disable make check for now, still investigating...
svn path=/nixpkgs/trunk/; revision=13101
2008-10-21 23:00:31 +00:00
Ludovic Courtès
448452a734 Gnash: Run the test suite.
svn path=/nixpkgs/trunk/; revision=13073
2008-10-15 08:43:50 +00:00
Marc Weber
1669c048a2 added meta tag to xvidcap
svn path=/nixpkgs/trunk/; revision=13071
2008-10-14 15:26:25 +00:00
Marc Weber
5a4a28e437 added cinelerra (video editing application)
svn path=/nixpkgs/trunk/; revision=13068
2008-10-14 14:01:50 +00:00
Ludovic Courtès
064d1af52b GNU Gnash 0.8.4.
svn path=/nixpkgs/trunk/; revision=13059
2008-10-14 08:26:00 +00:00
Ludovic Courtès
834144b5d3 GNU Gnash: Depend on Libtool.
This (1) allows Gnash to be linked against the available `libltdl' rather
than its own, and (2) it prevents `libtld.h' to be installed (which was the
case when Gnash's own libltdl was used), thereby avoiding a collision with
Libtool.

svn path=/nixpkgs/trunk/; revision=12292
2008-07-06 21:46:33 +00:00
Eelco Dolstra
9affba6463 * mythtv: build with Xv/X11/XvMV support. However, for some strange
Qt-related reason it currently needs libXmu in $LD_LIBRARY_PATH.

svn path=/nixpkgs/trunk/; revision=12191
2008-06-25 22:01:33 +00:00
Eelco Dolstra
677be83122 * Fixes for a52dec and mpeg2dec to make vlc build on x86_64-linux.
* Fixes to make par2cmdline and exult build on gcc 4.x, since gcc
  3.4.x doesn't seem to work on x86_64-linux (NIXPKGS-91).
* Disabled pidgin on x86_64-linux because it needs a dynamic libperl
  which we don't have right now.
* Disabled wine on x86_64-linux because we still lack -m32 support.

svn path=/nixpkgs/trunk/; revision=12187
2008-06-25 15:01:04 +00:00
Ludovic Courtès
a667b3289a Gnash: Use the GNU mirror, honor $TMPDIR.
svn path=/nixpkgs/trunk/; revision=12182
2008-06-25 08:50:39 +00:00
Eelco Dolstra
9d48cb846b * MythTV 0.21.
svn path=/nixpkgs/trunk/; revision=12177
2008-06-23 09:01:04 +00:00
Eelco Dolstra
faba06ce54 * firefox-wrapper: plugins no longer have to declare additional
LD_LIBRARY_PATH elements, since they can use patchelf --rpath if
  necessary.
* Flashplayer / JRE: do just that.
* JRE: libstdcpp5 no longer seems to be necessary for the plugin.

svn path=/nixpkgs/trunk/; revision=12094
2008-06-14 21:42:07 +00:00
Eelco Dolstra
fc5eebdf8b * Merged the stdenv branch
(https://svn.nixos.org/repos/nix/nixpkgs/branches/stdenv-updates
  -r10966:12061).

svn path=/nixpkgs/trunk/; revision=12073
2008-06-13 11:46:39 +00:00
Michael Raskin
4bc2a91eed Gnash 0.8.3
svn path=/nixpkgs/trunk/; revision=12070
2008-06-13 04:54:22 +00:00
Eelco Dolstra
09ab596e0f * Remove calls to fail().
svn path=/nixpkgs/branches/stdenv-updates/; revision=11690
2008-04-23 07:34:20 +00:00
Nicolas Pierron
4485ebdea6 Add real players codecs for MPlayer. (can now play *.rmvb files)
svn path=/nixpkgs/trunk/; revision=11552
2008-04-10 22:12:14 +00:00
Michael Raskin
1275775baf Reverted unneeded setting of NIX_LDFLAGS.
svn path=/nixpkgs/trunk/; revision=11112
2008-03-14 06:44:01 +00:00
Michael Raskin
8ec59864b2 Unfortunately needed here on NixOS...
svn path=/nixpkgs/trunk/; revision=11054
2008-03-11 12:37:22 +00:00
Ludovic Courtès
d35b3240fd Gnash: Add libXext' to the RPATH' of `gtk-gnash'.
svn path=/nixpkgs/trunk/; revision=11036
2008-03-10 15:05:32 +00:00
Ludovic Courtès
00e0e9ac37 Gnash: Install Mozilla plug-in.
svn path=/nixpkgs/trunk/; revision=11034
2008-03-10 13:24:11 +00:00
Ludovic Courtès
7c7639a888 GNU Gnash 0.8.2, Agg 2.5.
svn path=/nixpkgs/trunk/; revision=11030
2008-03-10 09:48:17 +00:00
Michael Raskin
003a6d10b5 Added CDDA support to MPlayer
svn path=/nixpkgs/trunk/; revision=10978
2008-03-06 09:34:36 +00:00
Yury G. Kudryashov
5bca69ac34 Nix-expr style review
Unneded args.something replaced with
args: with args;
line. After this line args is the only place where we can recieve variables from.

Also removed several
buildInputs = [];
lines.

svn path=/nixpkgs/trunk/; revision=10415
2008-01-30 17:20:48 +00:00
Yury G. Kudryashov
3386eea6c0 xine should work now
svn path=/nixpkgs/trunk/; revision=10353
2008-01-28 19:47:42 +00:00
Marc Weber
16c2ec2ef1 kino not finding dll fix. Now you can start it
svn path=/nixpkgs/trunk/; revision=10138
2008-01-13 18:08:51 +00:00
Marc Weber
ff62213cec kino (compiling but neither finding libX11 nor libghtread)
and libiec61883  (dependency)
added

svn path=/nixpkgs/trunk/; revision=10133
2008-01-13 15:21:21 +00:00
Eelco Dolstra
d3b45c26e2 * VLC 0.8.6d.
svn path=/nixpkgs/trunk/; revision=10001
2007-12-31 17:55:13 +00:00
Eelco Dolstra
441e3e19d6 * MPlayer 1.0rc2.
svn path=/nixpkgs/trunk/; revision=9535
2007-10-26 19:47:35 +00:00
Marc Weber
8942d938de flite added and added mplayer derivation with esound and new configuration style support (still a mess but works)
svn path=/nixpkgs/trunk/; revision=9326
2007-09-17 23:24:58 +00:00
Eelco Dolstra
544cb9cb83 * Rewrite all URLs to GNU mirrors to mirror://gnu/.
svn path=/nixpkgs/trunk/; revision=9201
2007-08-27 13:42:00 +00:00
Eelco Dolstra
607b0d3e80 * Rewrite all the SourceForge URLs to mirror://sourceforge/.
find . -name "*.nix" | while read fn; do sed 's^http://[a-z]*.dl.sourceforge.net/sourceforge/^mirror://sourceforge/^g' < $fn > $fn.new; mv $fn.new $fn; done

svn path=/nixpkgs/trunk/; revision=9198
2007-08-27 13:01:33 +00:00