JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Bring back libXxf86misc and xf86miscproto. These were removed from

Browse Source 
X.org, but some packages still need them.

svn path=/nixpkgs/branches/xorg-7.5/; revision=18038
This commit is contained in:
Eelco Dolstra 2009-10-29 18:25:53 +00:00
parent db52ebcc98
commit 05ff927d83
6 changed files with 64 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/desktops/kde-4.3/base-workspace/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, lib, cmake, perl, python, pam, ConsoleKit { stdenv, fetchurl, lib, cmake, perl, python, pam, ConsoleKit
, qt4, sip, pyqt4, kdelibs, kdelibs_experimental, kdepimlibs, kdebindings , qt4, sip, pyqt4, kdelibs, kdelibs_experimental, kdepimlibs, kdebindings
, libXi, libXau, libXdmcp, libXtst, libXcomposite, libXdamage, libXScrnSaver , libXi, libXau, libXdmcp, libXtst, libXcomposite, libXdamage, libXScrnSaver
, lm_sensors, libxklavier, libusb, pthread_stubs, boost , lm_sensors, libxklavier, libusb, libpthreadstubs, boost
, automoc4, phonon, strigi, soprano, qimageblitz, akonadi, polkit_qt , automoc4, phonon, strigi, soprano, qimageblitz, akonadi, polkit_qt
}: }:
@ -15,7 +15,7 @@ stdenv.mkDerivation {
CMAKE_PREFIX_PATH=kdepimlibs; CMAKE_PREFIX_PATH=kdepimlibs;
inherit kdelibs_experimental; inherit kdelibs_experimental;
builder = ./builder.sh; builder = ./builder.sh;
buildInputs = [ cmake perl python qt4 pam /*ConsoleKit sip pyqt4*/ kdelibs kdelibs_experimental kdepimlibs /*kdebindings*/ pthread_stubs boost libusb stdenv.gcc.libc buildInputs = [ cmake perl python qt4 pam /*ConsoleKit sip pyqt4*/ kdelibs kdelibs_experimental kdepimlibs /*kdebindings*/ libpthreadstubs boost libusb stdenv.gcc.libc
libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver
lm_sensors libxklavier automoc4 phonon strigi soprano qimageblitz akonadi polkit_qt ]; lm_sensors libxklavier automoc4 phonon strigi soprano qimageblitz akonadi polkit_qt ];
meta = { meta = {

8
pkgs/desktops/kde-4.3/default.nix
View File

@ -11,8 +11,8 @@ pkgs.recurseIntoAttrs (rec {
phonon = import ./support/phonon { phonon = import ./support/phonon {
inherit (pkgs) stdenv fetchurl lib cmake; inherit (pkgs) stdenv fetchurl lib cmake;
inherit (pkgs) qt4 pthread_stubs gst_all xineLib; inherit (pkgs) qt4 gst_all xineLib;
inherit (pkgs.xlibs) libXau libXdmcp; inherit (pkgs.xlibs) libXau libXdmcp libpthreadstubs;
inherit automoc4; inherit automoc4;
}; };
@ -68,8 +68,8 @@ pkgs.recurseIntoAttrs (rec {
### BASE ### BASE
kdebase_workspace = import ./base-workspace { kdebase_workspace = import ./base-workspace {
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl python pam sip pyqt4; inherit (pkgs) stdenv fetchurl lib cmake qt4 perl python pam sip pyqt4;
inherit (pkgs) lm_sensors libxklavier libusb pthread_stubs boost ConsoleKit; inherit (pkgs) lm_sensors libxklavier libusb boost ConsoleKit;
inherit (pkgs.xlibs) libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver; inherit (pkgs.xlibs) libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver libpthreadstubs;
inherit kdelibs kdelibs_experimental kdepimlibs kdebindings; inherit kdelibs kdelibs_experimental kdepimlibs kdebindings;
inherit automoc4 phonon strigi soprano qimageblitz akonadi polkit_qt; inherit automoc4 phonon strigi soprano qimageblitz akonadi polkit_qt;
}; };

4
pkgs/desktops/kde-4.3/support/phonon/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, lib, cmake, qt4 { stdenv, fetchurl, lib, cmake, qt4
, libXau, libXdmcp, pthread_stubs , libXau, libXdmcp, libpthreadstubs
, gst_all, xineLib, automoc4}: , gst_all, xineLib, automoc4}:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -9,7 +9,7 @@ stdenv.mkDerivation {
sha1 = "f7537e5280d0a4cc1348975daa7a7e45d833d45c"; sha1 = "f7537e5280d0a4cc1348975daa7a7e45d833d45c";
}; };
includeAllQtDirs = true; includeAllQtDirs = true;
buildInputs = [ cmake qt4 libXau libXdmcp pthread_stubs gst_all.gstreamer gst_all.gstPluginsBase xineLib automoc4 ]; buildInputs = [ cmake qt4 libXau libXdmcp libpthreadstubs gst_all.gstreamer gst_all.gstPluginsBase xineLib automoc4 ];
meta = { meta = {
description = "KDE Multimedia API"; description = "KDE Multimedia API";
longDescription = "KDE Multimedia API which abstracts over various backends such as GStreamer and Xine"; longDescription = "KDE Multimedia API which abstracts over various backends such as GStreamer and Xine";

68
pkgs/servers/x11/xorg/default.nix
View File

@ -827,6 +827,16 @@ let
buildInputs = [pkgconfig libX11 libXext xextproto xf86dgaproto xproto ]; buildInputs = [pkgconfig libX11 libXext xextproto xf86dgaproto xproto ];
})) // {inherit libX11 libXext xextproto xf86dgaproto xproto ;}; })) // {inherit libX11 libXext xextproto xf86dgaproto xproto ;};
libXxf86misc = (stdenv.mkDerivation ((if overrides ? libXxf86misc then overrides.libXxf86misc else x: x) {
name = "libXxf86misc-1.0.2";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/lib/libXxf86misc-1.0.2.tar.bz2;
sha256 = "1cvwjl4f83ic97j9da95x2a7gd0hw5vnv1pxn49d3z1lpyqvcr4f";
};
buildInputs = [pkgconfig libX11 libXext xextproto xf86miscproto xproto ];
})) // {inherit libX11 libXext xextproto xf86miscproto xproto ;};
libXxf86vm = (stdenv.mkDerivation ((if overrides ? libXxf86vm then overrides.libXxf86vm else x: x) { libXxf86vm = (stdenv.mkDerivation ((if overrides ? libXxf86vm then overrides.libXxf86vm else x: x) {
name = "libXxf86vm-1.1.0"; name = "libXxf86vm-1.1.0";
builder = ./builder.sh; builder = ./builder.sh;
@ -1148,14 +1158,14 @@ let
})) // {inherit gperf m4 libxcb xproto ;}; })) // {inherit gperf m4 libxcb xproto ;};
xclock = (stdenv.mkDerivation ((if overrides ? xclock then overrides.xclock else x: x) { xclock = (stdenv.mkDerivation ((if overrides ? xclock then overrides.xclock else x: x) {
name = "xclock-1.0.3"; name = "xclock-1.0.4";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = mirror://xorg/individual/app/xclock-1.0.3.tar.bz2; url = mirror://xorg/individual/app/xclock-1.0.4.tar.bz2;
sha256 = "0zspx5jqp52wgp4c4d9qaxhp0b9p2fzx2ys4rza10apgx5x7gd8h"; sha256 = "1w7dwrxjwhllynvkvms236jnls8aik8g755kbpycj4aj62v07fb9";
}; };
buildInputs = [pkgconfig libXaw libX11 libXft libxkbfile libXrender libXt ]; buildInputs = [pkgconfig libX11 libXaw libXft libxkbfile libXrender libXt ];
})) // {inherit libXaw libX11 libXft libxkbfile libXrender libXt ;}; })) // {inherit libX11 libXaw libXft libxkbfile libXrender libXt ;};
xcmiscproto = (stdenv.mkDerivation ((if overrides ? xcmiscproto then overrides.xcmiscproto else x: x) { xcmiscproto = (stdenv.mkDerivation ((if overrides ? xcmiscproto then overrides.xcmiscproto else x: x) {
name = "xcmiscproto-1.2.0"; name = "xcmiscproto-1.2.0";
@ -1204,8 +1214,8 @@ let
url = mirror://xorg/X11R7.5/src/everything/xdpyinfo-1.1.0.tar.bz2; url = mirror://xorg/X11R7.5/src/everything/xdpyinfo-1.1.0.tar.bz2;
sha256 = "0c86d890bbdswhpnknlfn1xg5xbjgymjhnfk4vp44gv5cpz8s3bq"; sha256 = "0c86d890bbdswhpnknlfn1xg5xbjgymjhnfk4vp44gv5cpz8s3bq";
}; };
buildInputs = [pkgconfig libdmx libX11 libXcomposite libXext libXi libXinerama libXp libXrender libXtst libXxf86dga libXxf86vm ]; buildInputs = [pkgconfig libdmx libX11 libXcomposite libXext libXi libXinerama libXp libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ];
})) // {inherit libdmx libX11 libXcomposite libXext libXi libXinerama libXp libXrender libXtst libXxf86dga libXxf86vm ;}; })) // {inherit libdmx libX11 libXcomposite libXext libXi libXinerama libXp libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ;};
xdriinfo = (stdenv.mkDerivation ((if overrides ? xdriinfo then overrides.xdriinfo else x: x) { xdriinfo = (stdenv.mkDerivation ((if overrides ? xdriinfo then overrides.xdriinfo else x: x) {
name = "xdriinfo-1.0.3"; name = "xdriinfo-1.0.3";
@ -1238,14 +1248,14 @@ let
})) // {inherit ;}; })) // {inherit ;};
xeyes = (stdenv.mkDerivation ((if overrides ? xeyes then overrides.xeyes else x: x) { xeyes = (stdenv.mkDerivation ((if overrides ? xeyes then overrides.xeyes else x: x) {
name = "xeyes-1.0.1"; name = "xeyes-1.0.991";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = mirror://xorg/individual/app/xeyes-1.0.1.tar.bz2; url = mirror://xorg/individual/app/xeyes-1.0.991.tar.bz2;
sha256 = "0ac0m9af193lxpyj11k2sp2xpmlhzzn3xrs6kdyy6c11fgl042ak"; sha256 = "05giiqnd90kxb3bmz5xpc2m8agf6lpgq99d908hm02mj9c8j8hsr";
}; };
buildInputs = [pkgconfig libX11 libXext libXmu libXt ]; buildInputs = [pkgconfig libX11 libXext libXmu libXrender libXt ];
})) // {inherit libX11 libXext libXmu libXt ;}; })) // {inherit libX11 libXext libXmu libXrender libXt ;};
xf86bigfontproto = (stdenv.mkDerivation ((if overrides ? xf86bigfontproto then overrides.xf86bigfontproto else x: x) { xf86bigfontproto = (stdenv.mkDerivation ((if overrides ? xf86bigfontproto then overrides.xf86bigfontproto else x: x) {
name = "xf86bigfontproto-1.2.0"; name = "xf86bigfontproto-1.2.0";
@ -1367,6 +1377,16 @@ let
buildInputs = [pkgconfig xorgserver xproto ]; buildInputs = [pkgconfig xorgserver xproto ];
})) // {inherit xorgserver xproto ;}; })) // {inherit xorgserver xproto ;};
xf86miscproto = (stdenv.mkDerivation ((if overrides ? xf86miscproto then overrides.xf86miscproto else x: x) {
name = "xf86miscproto-0.9.3";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/proto/xf86miscproto-0.9.3.tar.bz2;
sha256 = "15dhcdpv61fyj6rhzrhnwri9hlw8rjfy05z1vik118lc99mfrf25";
};
buildInputs = [pkgconfig ];
})) // {inherit ;};
xf86videoapm = (stdenv.mkDerivation ((if overrides ? xf86videoapm then overrides.xf86videoapm else x: x) { xf86videoapm = (stdenv.mkDerivation ((if overrides ? xf86videoapm then overrides.xf86videoapm else x: x) {
name = "xf86-video-apm-1.2.2"; name = "xf86-video-apm-1.2.2";
builder = ./builder.sh; builder = ./builder.sh;
@ -1514,8 +1534,8 @@ let
url = mirror://xorg/X11R7.5/src/everything/xf86-video-mach64-6.8.2.tar.bz2; url = mirror://xorg/X11R7.5/src/everything/xf86-video-mach64-6.8.2.tar.bz2;
sha256 = "07b7dkb6xc10pvf483dg52r2klpikmw339i5ln9ig913601r84dr"; sha256 = "07b7dkb6xc10pvf483dg52r2klpikmw339i5ln9ig913601r84dr";
}; };
buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xineramaproto xorgserver xproto ]; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ];
})) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xineramaproto xorgserver xproto ;}; })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ;};
xf86videomga = (stdenv.mkDerivation ((if overrides ? xf86videomga then overrides.xf86videomga else x: x) { xf86videomga = (stdenv.mkDerivation ((if overrides ? xf86videomga then overrides.xf86videomga else x: x) {
name = "xf86-video-mga-1.4.11"; name = "xf86-video-mga-1.4.11";
@ -1574,8 +1594,8 @@ let
url = mirror://xorg/X11R7.5/src/everything/xf86-video-r128-6.8.1.tar.bz2; url = mirror://xorg/X11R7.5/src/everything/xf86-video-r128-6.8.1.tar.bz2;
sha256 = "1jlybabm3k09hhlzx1xilndqngk3xgdck66n94sr02w5hg622zji"; sha256 = "1jlybabm3k09hhlzx1xilndqngk3xgdck66n94sr02w5hg622zji";
}; };
buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xineramaproto xorgserver xproto ]; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ];
})) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xineramaproto xorgserver xproto ;}; })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ;};
xf86videorendition = (stdenv.mkDerivation ((if overrides ? xf86videorendition then overrides.xf86videorendition else x: x) { xf86videorendition = (stdenv.mkDerivation ((if overrides ? xf86videorendition then overrides.xf86videorendition else x: x) {
name = "xf86-video-rendition-4.2.3"; name = "xf86-video-rendition-4.2.3";
@ -1828,11 +1848,11 @@ let
})) // {inherit ;}; })) // {inherit ;};
xfs = (stdenv.mkDerivation ((if overrides ? xfs then overrides.xfs else x: x) { xfs = (stdenv.mkDerivation ((if overrides ? xfs then overrides.xfs else x: x) {
name = "xfs-1.0.8"; name = "xfs-1.1.0";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = mirror://xorg/individual/app/xfs-1.0.8.tar.bz2; url = mirror://xorg/individual/app/xfs-1.1.0.tar.bz2;
sha256 = "10plnkkblkzrvnxszkvpbpm1fwjvrqkgjipsrp0jymdp7l5h9d9l"; sha256 = "0vazp4p2c9xayd1gdmlqqhklsv0770sgwvmafgjsi204rnxx9fj7";
}; };
buildInputs = [pkgconfig libFS libXfont xtrans ]; buildInputs = [pkgconfig libFS libXfont xtrans ];
})) // {inherit libFS libXfont xtrans ;}; })) // {inherit libFS libXfont xtrans ;};
@ -1958,11 +1978,11 @@ let
})) // {inherit libX11 ;}; })) // {inherit libX11 ;};
xorgcffiles = (stdenv.mkDerivation ((if overrides ? xorgcffiles then overrides.xorgcffiles else x: x) { xorgcffiles = (stdenv.mkDerivation ((if overrides ? xorgcffiles then overrides.xorgcffiles else x: x) {
name = "xorg-cf-files-1.0.2"; name = "xorg-cf-files-1.0.3";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = mirror://xorg/individual/util/xorg-cf-files-1.0.2.tar.bz2; url = mirror://xorg/individual/util/xorg-cf-files-1.0.3.tar.bz2;
sha256 = "15wmz9whf0j9irz5scqyyic4ardr53r6k15x2wcnxmfkqap16ip3"; sha256 = "02z2w72bwa1hvjyp7ilw37qs2zbr7cggabq18jzdpb4dzgcdwcmw";
}; };
buildInputs = [pkgconfig ]; buildInputs = [pkgconfig ];
})) // {inherit ;}; })) // {inherit ;};
@ -2064,8 +2084,8 @@ let
url = mirror://xorg/X11R7.5/src/everything/xset-1.1.0.tar.bz2; url = mirror://xorg/X11R7.5/src/everything/xset-1.1.0.tar.bz2;
sha256 = "0hs6amxfjbqp2y6bxxihmfnhxral6isb5l18z1fa54080g35kj3j"; sha256 = "0hs6amxfjbqp2y6bxxihmfnhxral6isb5l18z1fa54080g35kj3j";
}; };
buildInputs = [pkgconfig libX11 libXext libXmu libXp ]; buildInputs = [pkgconfig libX11 libXext libXmu libXp libXxf86misc ];
})) // {inherit libX11 libXext libXmu libXp ;}; })) // {inherit libX11 libXext libXmu libXp libXxf86misc ;};
xsetroot = (stdenv.mkDerivation ((if overrides ? xsetroot then overrides.xsetroot else x: x) { xsetroot = (stdenv.mkDerivation ((if overrides ? xsetroot then overrides.xsetroot else x: x) {
name = "xsetroot-1.0.3"; name = "xsetroot-1.0.3";

20
pkgs/servers/x11/xorg/old.list
View File

@ -1,11 +1,13 @@
mirror://xorg/individual/app/twm-1.0.4.tar.bz2
mirror://xorg/individual/app/xclock-1.0.4.tar.bz2
mirror://xorg/individual/app/xeyes-1.0.991.tar.bz2
mirror://xorg/individual/app/xfs-1.1.0.tar.bz2
mirror://xorg/individual/app/xmessage-1.0.2.tar.bz2
mirror://xorg/individual/lib/libXp-1.0.0.tar.bz2
mirror://xorg/individual/lib/libXxf86misc-1.0.2.tar.bz2
mirror://xorg/individual/proto/printproto-1.0.4.tar.bz2
mirror://xorg/individual/proto/xf86miscproto-0.9.3.tar.bz2
mirror://xorg/individual/util/gccmakedep-1.0.2.tar.bz2
mirror://xorg/individual/util/imake-1.0.2.tar.bz2 mirror://xorg/individual/util/imake-1.0.2.tar.bz2
mirror://xorg/individual/util/lndir-1.0.1.tar.bz2 mirror://xorg/individual/util/lndir-1.0.1.tar.bz2
mirror://xorg/individual/util/xorg-cf-files-1.0.2.tar.bz2 mirror://xorg/individual/util/xorg-cf-files-1.0.3.tar.bz2
mirror://xorg/individual/proto/printproto-1.0.4.tar.bz2
mirror://xorg/individual/lib/libXp-1.0.0.tar.bz2
mirror://xorg/individual/util/gccmakedep-1.0.2.tar.bz2
mirror://xorg/individual/app/xmessage-1.0.2.tar.bz2
mirror://xorg/individual/app/xeyes-1.0.1.tar.bz2
mirror://xorg/individual/app/xclock-1.0.3.tar.bz2
mirror://xorg/individual/app/xfs-1.0.8.tar.bz2
mirror://xorg/individual/app/twm-1.0.4.tar.bz2

2
pkgs/top-level/all-packages.nix
View File

@ -8665,7 +8665,7 @@ let
{ {
inherit stdenv fetchurl zlib aspell sox openssl qt4; inherit stdenv fetchurl zlib aspell sox openssl qt4;
inherit (xlibs) xproto libX11 libSM libICE; inherit (xlibs) xproto libX11 libSM libICE;
qca2 = kde.qca2; qca2 = kde4.qca2;
}; };
putty = import ../applications/networking/remote/putty { putty = import ../applications/networking/remote/putty {