summary refs log tree commit diff
path: root/pkgs/servers
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2015-05-26 19:03:14 +0200
committerVladimír Čunát <vcunat@gmail.com>2015-05-26 20:06:53 +0200
commitedeab759130b1ac213e2b744ac30e941b1a423f5 (patch)
tree7fd2ae14d0c0df7aa6062e6277b31b6784a71a55 /pkgs/servers
parent0e270def52fe334c271a339a1004d3569542a320 (diff)
downloadnixlib-edeab759130b1ac213e2b744ac30e941b1a423f5.tar
nixlib-edeab759130b1ac213e2b744ac30e941b1a423f5.tar.gz
nixlib-edeab759130b1ac213e2b744ac30e941b1a423f5.tar.bz2
nixlib-edeab759130b1ac213e2b744ac30e941b1a423f5.tar.lz
nixlib-edeab759130b1ac213e2b744ac30e941b1a423f5.tar.xz
nixlib-edeab759130b1ac213e2b744ac30e941b1a423f5.tar.zst
nixlib-edeab759130b1ac213e2b744ac30e941b1a423f5.zip
xcompmgr: generate along with xorg stuff
Also a minor update.
/cc maintainer @astsmtl.
Diffstat (limited to 'pkgs/servers')
-rw-r--r--pkgs/servers/x11/xorg/default.nix10
-rw-r--r--pkgs/servers/x11/xorg/tarballs-7.7.list1
2 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 8834a5e59fb6..1d8997e3c1db 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1294,6 +1294,16 @@ let
     buildInputs = [pkgconfig libX11 ];
   }) // {inherit libX11 ;};
 
+  xcompmgr = (mkDerivation "xcompmgr" {
+    name = "xcompmgr-1.1.7";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = mirror://xorg/individual/app/xcompmgr-1.1.7.tar.bz2;
+      sha256 = "14k89mz13jxgp4h2pz0yq0fbkw1lsfcb3acv8vkknc9i4ld9n168";
+    };
+    buildInputs = [pkgconfig libXcomposite libXdamage libXext libXfixes libXrender ];
+  }) // {inherit libXcomposite libXdamage libXext libXfixes libXrender ;};
+
   xcursorgen = (mkDerivation "xcursorgen" {
     name = "xcursorgen-1.0.6";
     builder = ./builder.sh;
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index baded542cab3..932d4f1236f2 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -108,6 +108,7 @@ mirror://xorg/individual/app/xbacklight-1.2.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xbitmaps-1.1.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xcmiscproto-1.2.2.tar.bz2
 mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2
+mirror://xorg/individual/app/xcompmgr-1.1.7.tar.bz2
 mirror://xorg/individual/app/xcursorgen-1.0.6.tar.bz2
 mirror://xorg/individual/data/xcursor-themes-1.0.4.tar.bz2
 mirror://xorg/individual/app/xdpyinfo-1.3.2.tar.bz2