Author: ludo
Date: Sun Jan 30 16:11:36 2011
New Revision: 25726
URL: https://svn.nixos.org/websvn/nix/?rev=25726&sc=1
Log:
GNU Xnee 3.08.
Modified:
nixpkgs/trunk/pkgs/tools/X11/xnee/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/tools/X11/xnee/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/X11/xnee/default.nix Sun Jan 30 15:30:22
2011 (r25725)
+++ nixpkgs/trunk/pkgs/tools/X11/xnee/default.nix Sun Jan 30 16:11:36
2011 (r25726)
@@ -1,31 +1,54 @@
-args :
-let
- fetchurl = args.fetchurl;
- lib=args.lib;
-
- version = lib.attrByPath ["version"] "3.01" args;
- buildInputs = with args; [
- libX11 xproto libXext xextproto libXtst gtk
- libXi inputproto pkgconfig recordproto
- ];
-in
-rec {
+{ fetchurl, stdenv, libX11, xproto, libXext, xextproto, libXtst
+, gtk, libXi, inputproto, pkgconfig, recordproto, texinfo }:
+
+stdenv.mkDerivation rec {
+ name = "xnee-3.08";
+
src = fetchurl {
- url = "mirror://gnu/xnee/Xnee-${version}.tar.gz";
- sha256 = "1g6wq1hjrmx102gg768nfs8a1ck77g5fn4pmprpsz9123xl4d181";
+ url = "mirror://gnu/xnee/${name}.tar.gz";
+ sha256 = "0lyznw4j7l2zrd46423cq2ahsp55s8j3phprgkrv0sm18y232yf7";
};
- inherit buildInputs;
- configureFlags = [
- "--disable-gnome-applet"
- ];
-
- /* doConfigure should be specified separately */
- phaseNames = ["doConfigure" "doMakeInstall"];
-
- name = "xnee-" + version;
+ patchPhase =
+ '' for i in `find cnee/test -name \*.sh`
+ do
+ sed -i "$i" -e's|/bin/bash|/bin/sh|g'
+ done
+ '';
+
+ buildInputs =
+ [ libX11 xproto libXext xextproto libXtst gtk
+ libXi inputproto pkgconfig recordproto
+ texinfo
+ ];
+
+ configureFlags =
+ # Do a static build because `libxnee' doesn't get installed anyway.
+ [ "--disable-gnome-applet" "--disable-shared" "--enable-static" ];
+
+ # `cnee' is linked without `-lXi' and as a consequence has a RUNPATH that
+ # lacks libXi.
+ makeFlags = "LDFLAGS=-lXi";
+
+ # XXX: Actually tests require an X server.
+ doCheck = true;
+
meta = {
- description = "X event recording and replay tool.";
+ description = "GNU Xnee, an X11 event recording and replay tool";
+
+ longDescription =
+ '' Xnee is a suite of programs that can record, replay and distribute
+ user actions under the X11 environment. Think of it as a robot that
+ can imitate the job you just did. Xnee can be used to automate
+ tests, demonstrate programs, distribute actions, record & replay
+ "macros", retype a file.
+ '';
+
+ license = "GPLv3+";
+
+ homepage = http://www.gnu.org/software/xnee/;
+
+ maintainers = [ stdenv.lib.maintainers.ludo ];
+ platforms = stdenv.lib.platforms.gnu; # arbitrary choice
};
}
-
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Jan 30 15:30:22
2011 (r25725)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Jan 30 16:11:36
2011 (r25726)
@@ -6836,11 +6836,9 @@
xmove = callPackage ../applications/misc/xmove { };
- xnee = builderDefsPackage (import ../tools/X11/xnee) {
- inherit (gtkLibs) gtk;
- inherit (xlibs) libX11 libXtst xextproto libXext
- inputproto libXi xproto recordproto;
- inherit pkgconfig;
+ xnee = callPackage ../tools/X11/xnee {
+ # Work around "missing separator" error.
+ stdenv = overrideInStdenv stdenv [ gnumake381 ];
};
xvidcap = callPackage ../applications/video/xvidcap {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
