diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-09-21 15:25:18 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-09-21 15:25:18 +0000 |
| commit | 93ddf8f572f6ac054a7f3a8ee00e14d70ab36b45 (patch) | |
| tree | 41cd59f073cac7f928199a121ff667549a736f1e | |
| parent | 454e5eb904e729d0388b0789ae94c2287b777e57 (diff) | |
| download | nixpkgs-93ddf8f572f6ac054a7f3a8ee00e14d70ab36b45.tar nixpkgs-93ddf8f572f6ac054a7f3a8ee00e14d70ab36b45.tar.gz nixpkgs-93ddf8f572f6ac054a7f3a8ee00e14d70ab36b45.tar.bz2 nixpkgs-93ddf8f572f6ac054a7f3a8ee00e14d70ab36b45.tar.lz nixpkgs-93ddf8f572f6ac054a7f3a8ee00e14d70ab36b45.tar.xz nixpkgs-93ddf8f572f6ac054a7f3a8ee00e14d70ab36b45.tar.zst nixpkgs-93ddf8f572f6ac054a7f3a8ee00e14d70ab36b45.zip | |
* Added Xinerama.
svn path=/nixpkgs/trunk/; revision=1479
| -rw-r--r-- | pkgs/development/libraries/xlibs/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/libraries/xlibs/libXinerama/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/development/libraries/xlibs/panoramixext/default.nix | 9 |
3 files changed, 29 insertions, 1 deletions
diff --git a/pkgs/development/libraries/xlibs/default.nix b/pkgs/development/libraries/xlibs/default.nix index f6b26c39d9e..304d7e4ba64 100644 --- a/pkgs/development/libraries/xlibs/default.nix +++ b/pkgs/development/libraries/xlibs/default.nix @@ -70,10 +70,18 @@ rec { inherit fetchurl stdenv pkgconfig libX11 libXext; }; - libXi = (import ./libXi) { + libXi = (import ./libXi) { # Xi = Xinput (not to be confused with Xinerama) inherit fetchurl stdenv pkgconfig libX11; }; + panoramixext = (import ./panoramixext) { + inherit fetchurl stdenv; + }; + + libXinerama = (import ./libXinerama) { + inherit fetchurl stdenv pkgconfig libX11 libXext panoramixext; + }; + xlibs = (import ./xlibs) { inherit stdenv libX11 libXt freetype fontconfig libXft libXext; }; diff --git a/pkgs/development/libraries/xlibs/libXinerama/default.nix b/pkgs/development/libraries/xlibs/libXinerama/default.nix new file mode 100644 index 00000000000..b40669378cc --- /dev/null +++ b/pkgs/development/libraries/xlibs/libXinerama/default.nix @@ -0,0 +1,11 @@ +{stdenv, fetchurl, pkgconfig, libX11, libXext, panoramixext}: + +stdenv.mkDerivation { + name = "libXinerama-1.0.2"; + src = fetchurl { + url = http://freedesktop.org/~xlibs/release/libXinerama-1.0.2.tar.bz2; + md5 = "637b2c5758d2de558670428d33178174"; + }; + buildInputs = [pkgconfig panoramixext]; + propagatedBuildInputs = [libX11 libXext]; +} diff --git a/pkgs/development/libraries/xlibs/panoramixext/default.nix b/pkgs/development/libraries/xlibs/panoramixext/default.nix new file mode 100644 index 00000000000..fd2472b3cfe --- /dev/null +++ b/pkgs/development/libraries/xlibs/panoramixext/default.nix @@ -0,0 +1,9 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "panoramixext-1.1"; + src = fetchurl { + url = http://freedesktop.org/~xlibs/release/panoramixext-1.1.tar.bz2; + md5 = "129f8623dc4f70188a015e3cbd7eae82"; + }; +} |