diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-07-29 10:06:49 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-07-29 10:06:49 +0000 |
| commit | 6b41222b5c5c88951c292f30c4750ff619b05d1a (patch) | |
| tree | 50fa195a7f9b6c6f29e4ac33301d14b00d596ac5 | |
| parent | 478c44aef3637a4578c1a735c0d96a6af572f059 (diff) | |
| download | nixpkgs-6b41222b5c5c88951c292f30c4750ff619b05d1a.tar nixpkgs-6b41222b5c5c88951c292f30c4750ff619b05d1a.tar.gz nixpkgs-6b41222b5c5c88951c292f30c4750ff619b05d1a.tar.bz2 nixpkgs-6b41222b5c5c88951c292f30c4750ff619b05d1a.tar.lz nixpkgs-6b41222b5c5c88951c292f30c4750ff619b05d1a.tar.xz nixpkgs-6b41222b5c5c88951c292f30c4750ff619b05d1a.tar.zst nixpkgs-6b41222b5c5c88951c292f30c4750ff619b05d1a.zip | |
* Added Xauth (pilfered from the modular X.org tree).
svn path=/nixpkgs/trunk/; revision=3466
| -rw-r--r-- | pkgs/system/all-packages-generic.nix | 8 | ||||
| -rw-r--r-- | pkgs/system/populate-cache.nix | 1 | ||||
| -rw-r--r-- | pkgs/tools/X11/xauth/default.nix | 10 |
3 files changed, 18 insertions, 1 deletions
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index b8fb9c45229..41b4ce4d139 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -202,7 +202,13 @@ rec { inherit fetchurl stdenv libjpeg; inherit (xlibs) libX11; }; - + + xauth = (import ../tools/X11/xauth) { + inherit fetchurl stdenv pkgconfig; + inherit (xlibs) libX11 libXau libXext libXmu; + }; + + ### SHELLS bash = (import ../shells/bash) { diff --git a/pkgs/system/populate-cache.nix b/pkgs/system/populate-cache.nix index af90e2f3d36..4548f5093f5 100644 --- a/pkgs/system/populate-cache.nix +++ b/pkgs/system/populate-cache.nix @@ -90,6 +90,7 @@ let { openssl mktemp strace + xauth qt3 xmltv mythtv diff --git a/pkgs/tools/X11/xauth/default.nix b/pkgs/tools/X11/xauth/default.nix new file mode 100644 index 00000000000..82cb4e29f7c --- /dev/null +++ b/pkgs/tools/X11/xauth/default.nix @@ -0,0 +1,10 @@ +{stdenv, fetchurl, pkgconfig, libX11, libXau, libXext, libXmu}: + +stdenv.mkDerivation { + name = "xauth-7.0"; + src = fetchurl { + url = http://losser.st-lab.cs.uu.nl/~eelco/dist/xauth-7.0.tar.bz2; + md5 = "d597005016baa8af81a5b0e38951d563"; + }; + buildInputs = [pkgconfig libX11 libXau libXext libXmu]; +} |