From 688b4ca5dbec29f126632187f5f726d11e3f5f74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 25 May 2015 11:11:05 +0200
Subject: [PATCH] xorg: add xmag and xgc apps
Tested very briefly.
---
pkgs/servers/x11/xorg/default.nix | 20 ++++++++++++++++++++
pkgs/servers/x11/xorg/tarballs-7.7.list | 2 ++
2 files changed, 22 insertions(+)
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 5c9e6483672b..d01caddd7109 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1874,6 +1874,16 @@ let
buildInputs = [pkgconfig libX11 xproto libXxf86vm ];
}) // {inherit libX11 xproto libXxf86vm ;};
+ xgc = (mkDerivation "xgc" {
+ name = "xgc-1.0.5";
+ builder = ./builder.sh;
+ src = fetchurl {
+ url = mirror://xorg/individual/app/xgc-1.0.5.tar.bz2;
+ sha256 = "0pigvjd3i9fchmj1inqy151aafz3dr0vq1h2zizdb2imvadqv0hl";
+ };
+ buildInputs = [pkgconfig libXaw libXt ];
+ }) // {inherit libXaw libXt ;};
+
xhost = (mkDerivation "xhost" {
name = "xhost-1.0.7";
builder = ./builder.sh;
@@ -1994,6 +2004,16 @@ let
buildInputs = [pkgconfig libxcb ];
}) // {inherit libxcb ;};
+ xmag = (mkDerivation "xmag" {
+ name = "xmag-1.0.6";
+ builder = ./builder.sh;
+ src = fetchurl {
+ url = mirror://xorg/individual/app/xmag-1.0.6.tar.bz2;
+ sha256 = "0qg12ifbbk9n8fh4jmyb625cknn8ssj86chd6zwdiqjin8ivr8l7";
+ };
+ buildInputs = [pkgconfig libX11 libXaw libXmu libXt ];
+ }) // {inherit libX11 libXaw libXmu libXt ;};
+
xmessage = (mkDerivation "xmessage" {
name = "xmessage-1.0.4";
builder = ./builder.sh;
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 6f8fcf53c76a..15568733cbec 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -163,6 +163,7 @@ mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-0.4.0.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86vidmodeproto-2.3.1.tar.bz2
mirror://xorg/individual/app/xgamma-1.0.6.tar.bz2
+mirror://xorg/individual/app/xgc-1.0.5.tar.bz2
mirror://xorg/individual/app/xhost-1.0.7.tar.bz2
mirror://xorg/X11R7.7/src/everything/xineramaproto-1.2.1.tar.bz2
mirror://xorg/individual/app/xinput-1.6.1.tar.bz2
@@ -173,6 +174,7 @@ mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.11.tar.bz2
mirror://xorg/individual/app/xkill-1.0.4.tar.bz2
mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2
mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2
+mirror://xorg/individual/app/xmag-1.0.6.tar.bz2
mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2
mirror://xorg/X11R7.7/src/everything/xorg-docs-1.7.tar.bz2
mirror://xorg/individual/xserver/xorg-server-1.16.4.tar.bz2