mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-17 18:34:41 +00:00
Code Issues Wiki Activity

* Remove the old modular X libraries.

Browse source 
svn path=/nixpkgs/trunk/; revision=5729
This commit is contained in:
Eelco Dolstra 2006-07-17 12:46:39 +00:00
parent fbf526d408
commit a908e6a4de
29 changed files with 2 additions and 402 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

104
pkgs/development/libraries/xlibs/default.nix
View file

@ -1,104 +0,0 @@
{stdenv, fetchurl, pkgconfig, freetype, fontconfig}:
rec {
xproto = (import ./xproto) {
inherit fetchurl stdenv;
};
xextensions = (import ./xextensions) {
inherit fetchurl stdenv;
};
libXtrans = (import ./libXtrans) {
inherit fetchurl stdenv;
};
libXau = (import ./libXau) {
inherit fetchurl stdenv pkgconfig xproto;
};
libX11 = (import ./libX11) {
inherit fetchurl stdenv pkgconfig xproto xextensions libXtrans libXau;
};
libXext = (import ./libXext) {
inherit fetchurl stdenv pkgconfig xproto xextensions libX11;
};
libICE = (import ./libICE) {
inherit fetchurl stdenv pkgconfig libX11;
};
libSM = (import ./libSM) {
inherit fetchurl stdenv pkgconfig libX11 libICE;
};
libXt = (import ./libXt) {
inherit fetchurl stdenv pkgconfig libX11 libSM;
};
renderext = (import ./renderext) {
inherit fetchurl stdenv;
};
libXrender = (import ./libXrender) {
inherit fetchurl stdenv pkgconfig libX11 renderext;
};
libXft = (import ./libXft) {
inherit fetchurl stdenv pkgconfig libX11 libXrender freetype fontconfig;
};
libXmu = (import ./libXmu) {
inherit fetchurl stdenv pkgconfig xproto libX11 libXt libXext;
};
libXpm = (import ./libXpm) {
inherit fetchurl stdenv pkgconfig xproto libX11;
};
libXaw = (import ./libXaw) {
inherit fetchurl stdenv pkgconfig xproto libX11 libXt libXmu libXpm;
};
libXv = (import ./libXv) {
inherit fetchurl stdenv pkgconfig libX11 libXext;
};
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;
};
libXp = (import ./libXp) {
inherit fetchurl stdenv pkgconfig libX11 libXext libXt;
};
xf86vmext = import ./xf86vmext {
inherit fetchurl stdenv;
};
libXxf86vm = import ./libXxf86vm {
inherit fetchurl stdenv pkgconfig libX11 libXext xf86vmext;
};
xlibs = (import ./xlibs) {
inherit stdenv libX11 libXt freetype fontconfig libXft libXext;
};
recordext = (import ./recordext) {
inherit fetchurl stdenv;
};
libXtst = (import ./libXtst) {
inherit fetchurl stdenv pkgconfig libX11 libXext recordext libXtrans;
};
}

10
pkgs/development/libraries/xlibs/libICE/default.nix
View file

@ -1,10 +0,0 @@
{stdenv, fetchurl, pkgconfig, libX11}:
stdenv.mkDerivation {
name = "libICE-6.3.3";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/libICE-6.3.3.tar.bz2;
md5 = "e67d98bebfabf884e58501e44b7efd35";
};
buildInputs = [pkgconfig libX11];
}

11
pkgs/development/libraries/xlibs/libSM/default.nix
View file

@ -1,11 +0,0 @@
{stdenv, fetchurl, pkgconfig, libX11, libICE}:
stdenv.mkDerivation {
name = "libSM-6.0.3";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/libSM-6.0.3.tar.bz2;
md5 = "e01ec6568ad17c5df8f56828e34a0b2b";
};
buildInputs = [pkgconfig];
propagatedBuildInputs = [libX11 libICE];
}

11
pkgs/development/libraries/xlibs/libX11/default.nix
View file

@ -1,11 +0,0 @@
{stdenv, fetchurl, pkgconfig, xproto, xextensions, libXtrans, libXau}:
stdenv.mkDerivation {
name = "libX11-6.2.1";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/libX11-6.2.1.tar.bz2;
md5 = "59b6fa7cd6fe7ee1da92fd1b56d1cee3";
};
buildInputs = [pkgconfig];
propagatedBuildInputs = [xproto xextensions libXtrans libXau];
}

10
pkgs/development/libraries/xlibs/libXau/default.nix
View file

@ -1,10 +0,0 @@
{stdenv, fetchurl, pkgconfig, xproto}:
stdenv.mkDerivation {
name = "libXau-0.1.1";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/libXau-0.1.1.tar.bz2;
md5 = "3d747ada4a7d17538fa21c62d5608656";
};
buildInputs = [pkgconfig xproto];
}

11
pkgs/development/libraries/xlibs/libXaw/default.nix
View file

@ -1,11 +0,0 @@
{stdenv, fetchurl, pkgconfig, xproto, libX11, libXt, libXmu, libXpm}:
stdenv.mkDerivation {
name = "libXaw-7.0.2";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/libXaw-7.0.2.tar.bz2;
md5 = "30d569f9560c1daac184d5be8085ce37";
};
buildInputs = [pkgconfig];
propagatedBuildInputs = [xproto libX11 libXt libXmu libXpm];
}

10
pkgs/development/libraries/xlibs/libXext/default.nix
View file

@ -1,10 +0,0 @@
{stdenv, fetchurl, pkgconfig, xproto, xextensions, libX11}:
stdenv.mkDerivation {
name = "libXext-6.4.3";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/libXext-6.4.3.tar.bz2;
md5 = "b7117194e69867905da9701dff56f3ee";
};
buildInputs = [pkgconfig xproto xextensions libX11];
}

14
pkgs/development/libraries/xlibs/libXft/default.nix
View file

@ -1,14 +0,0 @@
{stdenv, fetchurl, pkgconfig, libX11, libXrender, freetype, fontconfig}:
# !!! assert freetype `elem` fontconfig.buildInputs or some such
# assert freetype == fontconfig.freetype;
(stdenv.mkDerivation {
name = "libXft-2.1.7";
src = fetchurl {
url =http://xlibs.freedesktop.org/release/libXft-2.1.7.tar.bz2 ;
md5 = "3e311b4095283d59488b95c8bd772521";
};
buildInputs = [pkgconfig];
propagatedBuildInputs = [libX11 libXrender freetype fontconfig];
}) // {inherit freetype fontconfig;}

11
pkgs/development/libraries/xlibs/libXi/default.nix
View file

@ -1,11 +0,0 @@
{stdenv, fetchurl, pkgconfig, libX11}:
stdenv.mkDerivation {
name = "libXi-6.0.1";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/libXi-6.0.1.tar.bz2;
md5 = "7e935a42428d63a387b3c048be0f2756";
};
buildInputs = [pkgconfig];
propagatedBuildInputs = [libX11];
}

11
pkgs/development/libraries/xlibs/libXinerama/default.nix
View file

@ -1,11 +0,0 @@
{stdenv, fetchurl, pkgconfig, libX11, libXext, panoramixext}:
stdenv.mkDerivation {
name = "libXinerama-1.0.2";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/libXinerama-1.0.2.tar.bz2;
md5 = "637b2c5758d2de558670428d33178174";
};
buildInputs = [pkgconfig panoramixext];
propagatedBuildInputs = [libX11 libXext];
}

12
pkgs/development/libraries/xlibs/libXmu/default.nix
View file

@ -1,12 +0,0 @@
{stdenv, fetchurl, pkgconfig, xproto, libX11, libXt, libXext}:
stdenv.mkDerivation {
name = "libXmu-6.2.3";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/libXmu-6.2.3.tar.bz2;
md5 = "7671745bd8a1b0595847541479a327d6";
};
buildInputs = [pkgconfig];
propagatedBuildInputs = [xproto libX11 libXt libXext];
patches = ./no-Xaw.patch;
}

20
pkgs/development/libraries/xlibs/libXmu/no-Xaw.patch
View file

@ -1,20 +0,0 @@
diff -rc libXmu-orig/EditresCom.c libXmu-new/EditresCom.c
*** libXmu-orig/EditresCom.c 2004-05-07 02:19:04.000000000 +0200
--- libXmu-new/EditresCom.c 2004-06-21 20:01:34.000000000 +0200
***************
*** 40,46 ****
#include <X11/Xatom.h>
#include <X11/Xos.h> /* for strcpy declaration */
#include <X11/Xfuncs.h>
! #include <X11/Xaw/Cardinals.h>
#include <X11/Xmu/EditresP.h>
#include <X11/Xmd.h>
#include <X11/Xmu/CharSet.h>
--- 40,46 ----
#include <X11/Xatom.h>
#include <X11/Xos.h> /* for strcpy declaration */
#include <X11/Xfuncs.h>
! /* #include <X11/Xaw/Cardinals.h> */
#include <X11/Xmu/EditresP.h>
#include <X11/Xmd.h>
#include <X11/Xmu/CharSet.h>

11
pkgs/development/libraries/xlibs/libXp/default.nix
View file

@ -1,11 +0,0 @@
{stdenv, fetchurl, pkgconfig, libX11, libXext, libXt}:
stdenv.mkDerivation {
name = "libXp-6.2.0-cvs";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/libXp-6.2.0-cvs.tar.bz2;
md5 = "e9e69235e00fb80c3b399507f2699b1e";
};
buildInputs = [pkgconfig libXt];
propagatedBuildInputs = [libX11 libXext];
}

11
pkgs/development/libraries/xlibs/libXpm/default.nix
View file

@ -1,11 +0,0 @@
{stdenv, fetchurl, pkgconfig, xproto, libX11}:
stdenv.mkDerivation {
name = "libXpm-3.5.1";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/libXpm-3.5.1.tar.bz2;
md5 = "733e20a60c3343531b50bcc48348fd3e";
};
buildInputs = [pkgconfig];
propagatedBuildInputs = [xproto libX11];
}

11
pkgs/development/libraries/xlibs/libXrender/default.nix
View file

@ -1,11 +0,0 @@
{stdenv, fetchurl, pkgconfig, libX11, renderext}:
stdenv.mkDerivation {
name = "libXrender-0.9.0";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/libXrender-0.9.0.tar.bz2;
md5 = "ce7cda009aa0b10a73637941d44ae789";
};
buildInputs = [pkgconfig];
propagatedBuildInputs = [libX11 renderext];
}

11
pkgs/development/libraries/xlibs/libXt/default.nix
View file

@ -1,11 +0,0 @@
{stdenv, fetchurl, pkgconfig, libX11, libSM}:
stdenv.mkDerivation {
name = "libXt-0.1.5";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/libXt-0.1.5.tar.bz2;
md5 = "8ff20498eeedebe2fb72f93c2d7beab1";
};
buildInputs = [pkgconfig];
propagatedBuildInputs = [libX11 libSM];
}

9
pkgs/development/libraries/xlibs/libXtrans/default.nix
View file

@ -1,9 +0,0 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "libXtrans-0.1";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/libXtrans-0.1.tar.bz2;
md5 = "a5ae4c7a75f930053b8327f7bd0c1361";
};
}

10
pkgs/development/libraries/xlibs/libXtst/default.nix
View file

@ -1,10 +0,0 @@
{stdenv, fetchurl, pkgconfig, libX11, libXext, recordext, libXtrans}:
stdenv.mkDerivation {
name = "libXtst-6.2.2-cvs";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/libXtst-6.2.2.tar.bz2;
md5 = "6ee58bdcb151f1eccc761262f737e7d3";
};
buildInputs = [pkgconfig libX11 libXext recordext libXtrans];
}

11
pkgs/development/libraries/xlibs/libXv/default.nix
View file

@ -1,11 +0,0 @@
{stdenv, fetchurl, pkgconfig, libX11, libXext}:
stdenv.mkDerivation {
name = "libXv-2.2.2";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/libXv-2.2.2.tar.bz2;
md5 = "cdd6a79bac8807da83c008dac42fdddb";
};
buildInputs = [pkgconfig];
propagatedBuildInputs = [libX11 libXext];
}

11
pkgs/development/libraries/xlibs/libXxf86vm/default.nix
View file

@ -1,11 +0,0 @@
{stdenv, fetchurl, pkgconfig, libX11, libXext, xf86vmext}:
stdenv.mkDerivation {
name = "libXxf86vm-2.2.0-cvs";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/libXxf86vm-2.2.0-cvs.tar.bz2;
md5 = "0645a4f18ff720dbeabf5b2ff0fcd82a";
};
buildInputs = [pkgconfig];
propagatedBuildInputs = [libX11 libXext xf86vmext];
}

9
pkgs/development/libraries/xlibs/panoramixext/default.nix
View file

@ -1,9 +0,0 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "panoramixext-1.1";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/panoramixext-1.1.tar.bz2;
md5 = "129f8623dc4f70188a015e3cbd7eae82";
};
}

9
pkgs/development/libraries/xlibs/recordext/default.nix
View file

@ -1,9 +0,0 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "recordext-1.13-cvs";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/recordext-1.13.tar.bz2;
md5 = "dcb2519a76ce238507e777bd79b67ab5";
};
}

9
pkgs/development/libraries/xlibs/renderext/default.nix
View file

@ -1,9 +0,0 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "renderext-0.9";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/renderext-0.9.tar.bz2;
md5 = "d43c2afc69937655d13c02588c9ff974";
};
}

9
pkgs/development/libraries/xlibs/xextensions/default.nix
View file

@ -1,9 +0,0 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "xextensions-1.0.1";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/xextensions-1.0.1.tar.bz2;
md5 = "e61bca2a4757b736c9557dc8a7df2217";
};
}

9
pkgs/development/libraries/xlibs/xf86vmext/default.nix
View file

@ -1,9 +0,0 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "xf86vmext-2.2-cvs";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/xf86vmext-2.2-cvs.tar.bz2;
md5 = "5a5818accd51799626b8c6db429907e0";
};
}

8
pkgs/development/libraries/xlibs/xlibs/builder.sh
View file

@ -1,8 +0,0 @@
source $stdenv/setup
dontBuild=1
dontMakeInstall=1
nop() {
sourceRoot=.
}
unpackPhase=nop
genericBuild

10
pkgs/development/libraries/xlibs/xlibs/default.nix
View file

@ -1,10 +0,0 @@
{stdenv, libX11, libXt, freetype, fontconfig, libXft, libXext}:
stdenv.mkDerivation {
name = "xlib-1.0";
builder = ./builder.sh;
propagatedBuildInputs = [libX11 libXt freetype fontconfig libXft libXext];
} // {
# For compatability with XFree86.
buildClientLibs = true;
}

9
pkgs/development/libraries/xlibs/xproto/default.nix
View file

@ -1,9 +0,0 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "xproto-6.6.2";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/xproto-6.6.2.tar.bz2;
md5 = "fc419f3028cc2959b979a7e7464105f9";
};
}

12
pkgs/top-level/all-packages.nix
View file

@ -24,17 +24,13 @@ rec {
### Symbolic names.
useOldXLibs = false;
# `xlibs' is the set of X library components. This used to be the
# old modular X libraries project (called `xlibs') but now it's just
# the set of packages in the modular X.org tree (which also includes
# non-library components like the server, drivers, fonts, etc.).
xlibs = if useOldXLibs then xlibsOld else xorg // {xlibs = xlibsWrapper;};
xlibs = xorg // {xlibs = xlibsWrapper;};
# `xlibs.xlibs' is a wrapper packages that combines libX11 and a bunch
# of other basic X client libraries.
x11 = if useOldXLibs then xlibsOld.xlibs else xlibsWrapper;
x11 = xlibsWrapper;
### Helper functions.
@ -1355,10 +1351,6 @@ rec {
inherit fetchurl stdenv freetype expat;
};
xlibsOld = (import ../development/libraries/xlibs) {
inherit fetchurl stdenv pkgconfig freetype fontconfig;
};
xlibsWrapper = import ../development/libraries/xlibs-wrapper {
inherit stdenv;
packages = [