diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-05-03 14:46:55 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-05-03 14:46:55 +0000 |
| commit | b9686c27ed9ac993923b6e4ec2234dc0cf0b864d (patch) | |
| tree | 61bbb64e8e8125e378bd74eb810ef9d6dbae8731 /pkgs/development | |
| parent | d357f1a8ed3ffabae7310e9ece83af744a1d7f1a (diff) | |
| parent | d811b4c9d8db98c7667c9308afe949d445400bde (diff) | |
* Merge r990 into 0.5-stable. backups/0.5-stable@34171 0.5-stable
svn path=/nixpkgs/branches/0.5-stable/; revision=993
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/xlibs/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/xlibs/libXv/default.nix | 11 |
2 files changed, 15 insertions, 0 deletions
diff --git a/pkgs/development/libraries/xlibs/default.nix b/pkgs/development/libraries/xlibs/default.nix index f7d86e741eea7..60cf4e51ae5ac 100644 --- a/pkgs/development/libraries/xlibs/default.nix +++ b/pkgs/development/libraries/xlibs/default.nix @@ -66,6 +66,10 @@ rec { inherit fetchurl stdenv pkgconfig xproto libX11 libXt libXmu libXpm; }; + libXv = (import ./libXv) { + inherit fetchurl stdenv pkgconfig libX11; + }; + xlibs = (import ./xlibs) { inherit stdenv libX11 libXt freetype fontconfig libXft libXext; }; diff --git a/pkgs/development/libraries/xlibs/libXv/default.nix b/pkgs/development/libraries/xlibs/libXv/default.nix new file mode 100644 index 0000000000000..067dad6a37e5f --- /dev/null +++ b/pkgs/development/libraries/xlibs/libXv/default.nix @@ -0,0 +1,11 @@ +{stdenv, fetchurl, pkgconfig, libX11}: + +stdenv.mkDerivation { + name = "libXv-2.2.1"; + src = fetchurl { + url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libXv-2.2.1.tar.bz2; + md5 = "89b8ca62a77c662a8a7ded89bcf0dd67"; + }; + buildInputs = [pkgconfig]; + propagatedBuildInputs = [libX11]; +} |