diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-07-10 08:45:44 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-07-10 08:45:44 +0000 |
| commit | a8c55348491f65bb74e0b8d17c9dca7b7825cfa7 (patch) | |
| tree | ef3cd83ae94cc05fd4686a4a707f7ab8e94d7893 /pkgs/top-level/all-packages.nix | |
| parent | 134e9447583ce324b62baf8b697717b048458ec2 (diff) | |
Adding virtualgl (and therefore, libjpeg-turbo, a SIMD API-compatible libjpeg)
svn path=/nixpkgs/trunk/; revision=22553
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 537a2cdcb3da6..61d9e764ef1ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4670,6 +4670,10 @@ let inherit fetchurl stdenv; }; + libjpeg_turbo = makeOverridable (import ../development/libraries/libjpeg-turbo) { + inherit fetchurl stdenv nasm; + }; + libjpeg62 = makeOverridable (import ../development/libraries/libjpeg/62.nix) { inherit fetchurl stdenv; libtool = libtool_1_5; @@ -8944,6 +8948,11 @@ let flags = [ "X11" ]; # only flag "X11" by now }; + virtualgl = import ../tools/X11/virtualgl { + inherit stdenv fetchurl mesa openssl libjpeg_turbo; + inherit (xlibs) libX11 libXext; + }; + vlc = import ../applications/video/vlc { inherit fetchurl stdenv perl xlibs zlib a52dec libmad faad2 ffmpeg libdvdnav pkgconfig hal fribidi qt4 freefont_ttf |