diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-04-18 12:47:11 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-04-18 12:47:11 +0000 |
| commit | cee387e84503f01988099759be5cd0da0406ca78 (patch) | |
| tree | a5afead583dc092636cc401c755df09fa7883a76 /pkgs/applications/video | |
| parent | 034248f57a17c2db02f8bc2656c8d5ba446e4537 (diff) | |
* 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
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/cinelerra/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix index 501c7c33df11..2029c98037f9 100644 --- a/pkgs/applications/video/cinelerra/default.nix +++ b/pkgs/applications/video/cinelerra/default.nix @@ -14,7 +14,7 @@ args.stdenv.mkDerivation { buildInputs =(with args; [ automake autoconf libtool pkgconfig - X11 faad2 faac + faad2 faac a52dec alsaLib fftw lame libavc1394 libiec61883 libraw1394 libsndfile libvorbis libogg libjpeg libtiff freetype mjpegtools x264 gettext openexr esound |