From a908e6a4de821d5293639cc2adb880c9beda9187 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 17 Jul 2006 12:46:39 +0000 Subject: [PATCH] * Remove the old modular X libraries. svn path=/nixpkgs/trunk/; revision=5729 --- pkgs/development/libraries/xlibs/default.nix | 104 ------------------ .../libraries/xlibs/libICE/default.nix | 10 -- .../libraries/xlibs/libSM/default.nix | 11 -- .../libraries/xlibs/libX11/default.nix | 11 -- .../libraries/xlibs/libXau/default.nix | 10 -- .../libraries/xlibs/libXaw/default.nix | 11 -- .../libraries/xlibs/libXext/default.nix | 10 -- .../libraries/xlibs/libXft/default.nix | 14 --- .../libraries/xlibs/libXi/default.nix | 11 -- .../libraries/xlibs/libXinerama/default.nix | 11 -- .../libraries/xlibs/libXmu/default.nix | 12 -- .../libraries/xlibs/libXmu/no-Xaw.patch | 20 ---- .../libraries/xlibs/libXp/default.nix | 11 -- .../libraries/xlibs/libXpm/default.nix | 11 -- .../libraries/xlibs/libXrender/default.nix | 11 -- .../libraries/xlibs/libXt/default.nix | 11 -- .../libraries/xlibs/libXtrans/default.nix | 9 -- .../libraries/xlibs/libXtst/default.nix | 10 -- .../libraries/xlibs/libXv/default.nix | 11 -- .../libraries/xlibs/libXxf86vm/default.nix | 11 -- .../libraries/xlibs/panoramixext/default.nix | 9 -- .../libraries/xlibs/recordext/default.nix | 9 -- .../libraries/xlibs/renderext/default.nix | 9 -- .../libraries/xlibs/xextensions/default.nix | 9 -- .../libraries/xlibs/xf86vmext/default.nix | 9 -- .../libraries/xlibs/xlibs/builder.sh | 8 -- .../libraries/xlibs/xlibs/default.nix | 10 -- .../libraries/xlibs/xproto/default.nix | 9 -- pkgs/top-level/all-packages.nix | 12 +- 29 files changed, 2 insertions(+), 402 deletions(-) delete mode 100644 pkgs/development/libraries/xlibs/default.nix delete mode 100644 pkgs/development/libraries/xlibs/libICE/default.nix delete mode 100644 pkgs/development/libraries/xlibs/libSM/default.nix delete mode 100644 pkgs/development/libraries/xlibs/libX11/default.nix delete mode 100644 pkgs/development/libraries/xlibs/libXau/default.nix delete mode 100644 pkgs/development/libraries/xlibs/libXaw/default.nix delete mode 100644 pkgs/development/libraries/xlibs/libXext/default.nix delete mode 100644 pkgs/development/libraries/xlibs/libXft/default.nix delete mode 100644 pkgs/development/libraries/xlibs/libXi/default.nix delete mode 100644 pkgs/development/libraries/xlibs/libXinerama/default.nix delete mode 100644 pkgs/development/libraries/xlibs/libXmu/default.nix delete mode 100644 pkgs/development/libraries/xlibs/libXmu/no-Xaw.patch delete mode 100644 pkgs/development/libraries/xlibs/libXp/default.nix delete mode 100644 pkgs/development/libraries/xlibs/libXpm/default.nix delete mode 100644 pkgs/development/libraries/xlibs/libXrender/default.nix delete mode 100644 pkgs/development/libraries/xlibs/libXt/default.nix delete mode 100644 pkgs/development/libraries/xlibs/libXtrans/default.nix delete mode 100644 pkgs/development/libraries/xlibs/libXtst/default.nix delete mode 100644 pkgs/development/libraries/xlibs/libXv/default.nix delete mode 100644 pkgs/development/libraries/xlibs/libXxf86vm/default.nix delete mode 100644 pkgs/development/libraries/xlibs/panoramixext/default.nix delete mode 100644 pkgs/development/libraries/xlibs/recordext/default.nix delete mode 100644 pkgs/development/libraries/xlibs/renderext/default.nix delete mode 100644 pkgs/development/libraries/xlibs/xextensions/default.nix delete mode 100644 pkgs/development/libraries/xlibs/xf86vmext/default.nix delete mode 100644 pkgs/development/libraries/xlibs/xlibs/builder.sh delete mode 100644 pkgs/development/libraries/xlibs/xlibs/default.nix delete mode 100644 pkgs/development/libraries/xlibs/xproto/default.nix diff --git a/pkgs/development/libraries/xlibs/default.nix b/pkgs/development/libraries/xlibs/default.nix deleted file mode 100644 index a78d917bbb5f..000000000000 --- a/pkgs/development/libraries/xlibs/default.nix +++ /dev/null @@ -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; - }; -} diff --git a/pkgs/development/libraries/xlibs/libICE/default.nix b/pkgs/development/libraries/xlibs/libICE/default.nix deleted file mode 100644 index 923624d37a8e..000000000000 --- a/pkgs/development/libraries/xlibs/libICE/default.nix +++ /dev/null @@ -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]; -} diff --git a/pkgs/development/libraries/xlibs/libSM/default.nix b/pkgs/development/libraries/xlibs/libSM/default.nix deleted file mode 100644 index 417f2d6ffa0c..000000000000 --- a/pkgs/development/libraries/xlibs/libSM/default.nix +++ /dev/null @@ -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]; -} diff --git a/pkgs/development/libraries/xlibs/libX11/default.nix b/pkgs/development/libraries/xlibs/libX11/default.nix deleted file mode 100644 index 9991c37f84a1..000000000000 --- a/pkgs/development/libraries/xlibs/libX11/default.nix +++ /dev/null @@ -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]; -} diff --git a/pkgs/development/libraries/xlibs/libXau/default.nix b/pkgs/development/libraries/xlibs/libXau/default.nix deleted file mode 100644 index 4ba16cead090..000000000000 --- a/pkgs/development/libraries/xlibs/libXau/default.nix +++ /dev/null @@ -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]; -} diff --git a/pkgs/development/libraries/xlibs/libXaw/default.nix b/pkgs/development/libraries/xlibs/libXaw/default.nix deleted file mode 100644 index e644ee92e25b..000000000000 --- a/pkgs/development/libraries/xlibs/libXaw/default.nix +++ /dev/null @@ -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]; -} diff --git a/pkgs/development/libraries/xlibs/libXext/default.nix b/pkgs/development/libraries/xlibs/libXext/default.nix deleted file mode 100644 index dbbeac242115..000000000000 --- a/pkgs/development/libraries/xlibs/libXext/default.nix +++ /dev/null @@ -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]; -} diff --git a/pkgs/development/libraries/xlibs/libXft/default.nix b/pkgs/development/libraries/xlibs/libXft/default.nix deleted file mode 100644 index 05a3afccb344..000000000000 --- a/pkgs/development/libraries/xlibs/libXft/default.nix +++ /dev/null @@ -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;} \ No newline at end of file diff --git a/pkgs/development/libraries/xlibs/libXi/default.nix b/pkgs/development/libraries/xlibs/libXi/default.nix deleted file mode 100644 index 8171b5d8e8f0..000000000000 --- a/pkgs/development/libraries/xlibs/libXi/default.nix +++ /dev/null @@ -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]; -} diff --git a/pkgs/development/libraries/xlibs/libXinerama/default.nix b/pkgs/development/libraries/xlibs/libXinerama/default.nix deleted file mode 100644 index 819bb387c108..000000000000 --- a/pkgs/development/libraries/xlibs/libXinerama/default.nix +++ /dev/null @@ -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]; -} diff --git a/pkgs/development/libraries/xlibs/libXmu/default.nix b/pkgs/development/libraries/xlibs/libXmu/default.nix deleted file mode 100644 index ad03d8f14eea..000000000000 --- a/pkgs/development/libraries/xlibs/libXmu/default.nix +++ /dev/null @@ -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; -} diff --git a/pkgs/development/libraries/xlibs/libXmu/no-Xaw.patch b/pkgs/development/libraries/xlibs/libXmu/no-Xaw.patch deleted file mode 100644 index ba84f60f807d..000000000000 --- a/pkgs/development/libraries/xlibs/libXmu/no-Xaw.patch +++ /dev/null @@ -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 - #include /* for strcpy declaration */ - #include -! #include - #include - #include - #include ---- 40,46 ---- - #include - #include /* for strcpy declaration */ - #include -! /* #include */ - #include - #include - #include diff --git a/pkgs/development/libraries/xlibs/libXp/default.nix b/pkgs/development/libraries/xlibs/libXp/default.nix deleted file mode 100644 index 9ffe61ba28a1..000000000000 --- a/pkgs/development/libraries/xlibs/libXp/default.nix +++ /dev/null @@ -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]; -} diff --git a/pkgs/development/libraries/xlibs/libXpm/default.nix b/pkgs/development/libraries/xlibs/libXpm/default.nix deleted file mode 100644 index 54177eb7a039..000000000000 --- a/pkgs/development/libraries/xlibs/libXpm/default.nix +++ /dev/null @@ -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]; -} diff --git a/pkgs/development/libraries/xlibs/libXrender/default.nix b/pkgs/development/libraries/xlibs/libXrender/default.nix deleted file mode 100644 index 2cb31b2498b6..000000000000 --- a/pkgs/development/libraries/xlibs/libXrender/default.nix +++ /dev/null @@ -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]; -} diff --git a/pkgs/development/libraries/xlibs/libXt/default.nix b/pkgs/development/libraries/xlibs/libXt/default.nix deleted file mode 100644 index 5836b139b7d0..000000000000 --- a/pkgs/development/libraries/xlibs/libXt/default.nix +++ /dev/null @@ -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]; -} diff --git a/pkgs/development/libraries/xlibs/libXtrans/default.nix b/pkgs/development/libraries/xlibs/libXtrans/default.nix deleted file mode 100644 index 5ba3664220d0..000000000000 --- a/pkgs/development/libraries/xlibs/libXtrans/default.nix +++ /dev/null @@ -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"; - }; -} diff --git a/pkgs/development/libraries/xlibs/libXtst/default.nix b/pkgs/development/libraries/xlibs/libXtst/default.nix deleted file mode 100644 index 9fdddf7ee89d..000000000000 --- a/pkgs/development/libraries/xlibs/libXtst/default.nix +++ /dev/null @@ -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]; -} diff --git a/pkgs/development/libraries/xlibs/libXv/default.nix b/pkgs/development/libraries/xlibs/libXv/default.nix deleted file mode 100644 index 86234b7e5e56..000000000000 --- a/pkgs/development/libraries/xlibs/libXv/default.nix +++ /dev/null @@ -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]; -} diff --git a/pkgs/development/libraries/xlibs/libXxf86vm/default.nix b/pkgs/development/libraries/xlibs/libXxf86vm/default.nix deleted file mode 100644 index ec78d2ac47e3..000000000000 --- a/pkgs/development/libraries/xlibs/libXxf86vm/default.nix +++ /dev/null @@ -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]; -} diff --git a/pkgs/development/libraries/xlibs/panoramixext/default.nix b/pkgs/development/libraries/xlibs/panoramixext/default.nix deleted file mode 100644 index 5594f2a40a86..000000000000 --- a/pkgs/development/libraries/xlibs/panoramixext/default.nix +++ /dev/null @@ -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"; - }; -} diff --git a/pkgs/development/libraries/xlibs/recordext/default.nix b/pkgs/development/libraries/xlibs/recordext/default.nix deleted file mode 100644 index e682e949213a..000000000000 --- a/pkgs/development/libraries/xlibs/recordext/default.nix +++ /dev/null @@ -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"; - }; -} diff --git a/pkgs/development/libraries/xlibs/renderext/default.nix b/pkgs/development/libraries/xlibs/renderext/default.nix deleted file mode 100644 index dc1a90892f4c..000000000000 --- a/pkgs/development/libraries/xlibs/renderext/default.nix +++ /dev/null @@ -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"; - }; -} diff --git a/pkgs/development/libraries/xlibs/xextensions/default.nix b/pkgs/development/libraries/xlibs/xextensions/default.nix deleted file mode 100644 index 45db6adbc74c..000000000000 --- a/pkgs/development/libraries/xlibs/xextensions/default.nix +++ /dev/null @@ -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"; - }; -} diff --git a/pkgs/development/libraries/xlibs/xf86vmext/default.nix b/pkgs/development/libraries/xlibs/xf86vmext/default.nix deleted file mode 100644 index 17339c201b8d..000000000000 --- a/pkgs/development/libraries/xlibs/xf86vmext/default.nix +++ /dev/null @@ -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"; - }; -} diff --git a/pkgs/development/libraries/xlibs/xlibs/builder.sh b/pkgs/development/libraries/xlibs/xlibs/builder.sh deleted file mode 100644 index 7e40acf9198e..000000000000 --- a/pkgs/development/libraries/xlibs/xlibs/builder.sh +++ /dev/null @@ -1,8 +0,0 @@ -source $stdenv/setup -dontBuild=1 -dontMakeInstall=1 -nop() { - sourceRoot=. -} -unpackPhase=nop -genericBuild diff --git a/pkgs/development/libraries/xlibs/xlibs/default.nix b/pkgs/development/libraries/xlibs/xlibs/default.nix deleted file mode 100644 index 4c8475c21e71..000000000000 --- a/pkgs/development/libraries/xlibs/xlibs/default.nix +++ /dev/null @@ -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; -} diff --git a/pkgs/development/libraries/xlibs/xproto/default.nix b/pkgs/development/libraries/xlibs/xproto/default.nix deleted file mode 100644 index 992ff12939e7..000000000000 --- a/pkgs/development/libraries/xlibs/xproto/default.nix +++ /dev/null @@ -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"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c5f5396bfe5..48213a0162bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 = [