mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-12 08:01:50 +00:00
Fixed synaptics; Added GOCR (not that it is a good OCR); reverted MarcWeber's update to setup-new-2.sh (he has no time to use it in nearest future; later I hope it will be irrelevant)
svn path=/nixpkgs/trunk/; revision=9613
This commit is contained in:
parent
ea1209571d
commit
43b208bbb9
pkgs
applications/graphics/gocr
misc/synaptics
servers/x11/xorg
stdenv/generic
tools/archivers/gnutar
top-level
21
pkgs/applications/graphics/gocr/0.44.nix
Normal file
21
pkgs/applications/graphics/gocr/0.44.nix
Normal file
|
@ -0,0 +1,21 @@
|
||||||
|
args : with args;
|
||||||
|
with builderDefs {
|
||||||
|
src = /* put a fetchurl here */
|
||||||
|
fetchurl {
|
||||||
|
url = http://prdownloads.sourceforge.net/jocr/gocr-0.44.tar.gz;
|
||||||
|
sha256 = "0kvb7cbk6z5n4g0hhbwpdk2f3819yfamwsmkwanj99yhni6p5mr0";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs = [];
|
||||||
|
configureFlags = [];
|
||||||
|
} null; /* null is a terminator for sumArgs */
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "gocr";
|
||||||
|
builder = writeScript (name + "-builder")
|
||||||
|
(textClosure [doConfigure doMakeInstall doForceShare doPropagate]);
|
||||||
|
meta = {
|
||||||
|
description = "
|
||||||
|
GPL Optical Character Recognition
|
||||||
|
";
|
||||||
|
};
|
||||||
|
}
|
2
pkgs/applications/graphics/gocr/default.nix
Normal file
2
pkgs/applications/graphics/gocr/default.nix
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
args :
|
||||||
|
(import (__toPath ((toString ./JustNothing/.. )+"/"+args.version+".nix"))) args
|
|
@ -7,9 +7,16 @@ stdenv.mkDerivation {
|
||||||
md5 = "1102cd575045640a064ab6f9b1e391af";
|
md5 = "1102cd575045640a064ab6f9b1e391af";
|
||||||
};
|
};
|
||||||
|
|
||||||
preBuild = "export NIX_CFLAGS_COMPILE=\"\${NIX_CFLAGS_COMPILE} -I${pixman}/include/pixman-1\"";
|
preBuild = "export NIX_CFLAGS_COMPILE=\"\${NIX_CFLAGS_COMPILE} -I${pixman}/include/pixman-1\";
|
||||||
|
sed -e '/local-[>]motion_history_proc/d; /local-[>]history_size/d;' -i synaptics.c
|
||||||
|
sed -e '/ALLINCLUDES = /iX_INCLUDES_ROOT = /homeless-shelter' -i Makefile
|
||||||
|
sed -e 's@^CFLAGS =.*@& -DDBG=//@' -i Makefile
|
||||||
|
sed -e 's/miPointerGetMotionBufferSize()/&,2/' -i synaptics.c
|
||||||
|
sed -e 's/miPointerGetMotionEvents/GetMotionHistory/' -i synaptics.c
|
||||||
|
sed -e 's/miPointerGetMotionBufferSize/GetMotionHistorySize/' -i synaptics.c
|
||||||
|
";
|
||||||
makeFlags="DESTDIR=\${out} PREFIX=/ ";
|
makeFlags="DESTDIR=\${out} PREFIX=/ ";
|
||||||
buildInputs = [libX11 pkgconfig xorgserver libXi libXext pixman];
|
buildInputs = [libX11 pkgconfig xorgserver libXi libXext pixman xf86inputevdev];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Driver for synaptics touchpad.";
|
description = "Driver for synaptics touchpad.";
|
||||||
|
|
|
@ -1743,6 +1743,9 @@ rec {
|
||||||
url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-evdev-1.1.2.tar.bz2;
|
url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-evdev-1.1.2.tar.bz2;
|
||||||
sha256 = "15avwy8isbqagzcdj20ngqajl22k40pssfx7vjirhrqyyq19fiwb";
|
sha256 = "15avwy8isbqagzcdj20ngqajl22k40pssfx7vjirhrqyyq19fiwb";
|
||||||
};
|
};
|
||||||
|
preBuild = "
|
||||||
|
sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c
|
||||||
|
";
|
||||||
buildInputs = [pkgconfig inputproto kbproto randrproto xorgserver xproto ];
|
buildInputs = [pkgconfig inputproto kbproto randrproto xorgserver xproto ];
|
||||||
}) // {inherit inputproto kbproto randrproto xorgserver xproto ;};
|
}) // {inherit inputproto kbproto randrproto xorgserver xproto ;};
|
||||||
|
|
||||||
|
|
|
@ -28,17 +28,6 @@ addToSearchPath()
|
||||||
addToSearchPathWithCustomDelimiter "${PATH_DELIMITER}" "$@"
|
addToSearchPathWithCustomDelimiter "${PATH_DELIMITER}" "$@"
|
||||||
}
|
}
|
||||||
|
|
||||||
# Would adding -e to echo be useful? ( "\n" -> newline. useful for one liners )
|
|
||||||
# usage:
|
|
||||||
# createShScript $out/bin/yourscript \
|
|
||||||
# "#!/bin/sh
|
|
||||||
# echo Hello World"
|
|
||||||
# should we add ensureDir $(basename $1) ?
|
|
||||||
createShScript(){
|
|
||||||
echo "$2" > "$1"
|
|
||||||
chmod +x "$1"
|
|
||||||
}
|
|
||||||
|
|
||||||
# Set up the initial path.
|
# Set up the initial path.
|
||||||
PATH=
|
PATH=
|
||||||
for i in $NIX_GCC @initialPath@; do
|
for i in $NIX_GCC @initialPath@; do
|
||||||
|
|
11
pkgs/tools/archivers/gnutar/1.17.nix
Normal file
11
pkgs/tools/archivers/gnutar/1.17.nix
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
{stdenv, fetchurl}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation {
|
||||||
|
name = "gnutar-1.17";
|
||||||
|
src =
|
||||||
|
fetchurl {
|
||||||
|
url = mirror://gnu/tar/tar-1.17.tar.bz2;
|
||||||
|
sha256 = "14m49kya1swilivc2laycw3p3y3i1s3q0vkhwjan58aiv8fh5y8r";
|
||||||
|
};
|
||||||
|
patches = [./implausible.patch];
|
||||||
|
}
|
11
pkgs/tools/archivers/gnutar/1.18.nix
Normal file
11
pkgs/tools/archivers/gnutar/1.18.nix
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
{stdenv, fetchurl}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation {
|
||||||
|
name = "gnutar-1.17";
|
||||||
|
src =
|
||||||
|
fetchurl {
|
||||||
|
url = mirror://gnu/tar/tar-1.18.tar.bz2;
|
||||||
|
sha256 = "0png2yqkw333acf55k0hjs0mcx1s0w0gkf50pa6hv3kw8bh4x524";
|
||||||
|
};
|
||||||
|
patches = [./implausible.patch ./gnulib-futimens.patch];
|
||||||
|
}
|
|
@ -3679,6 +3679,14 @@ rec {
|
||||||
inherit (xlibs) libX11 libXext libXi libXmu;
|
inherit (xlibs) libX11 libXext libXi libXmu;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
gocrFun = lib.sumArgs (import ../applications/graphics/gocr) {
|
||||||
|
inherit builderDefs fetchurl stdenv;
|
||||||
|
};
|
||||||
|
|
||||||
|
gocr = gocrFun {
|
||||||
|
version = "0.44";
|
||||||
|
} null;
|
||||||
|
|
||||||
gphoto2 = import ../applications/misc/gphoto2 {
|
gphoto2 = import ../applications/misc/gphoto2 {
|
||||||
inherit fetchurl stdenv pkgconfig libgphoto2 libexif popt;
|
inherit fetchurl stdenv pkgconfig libgphoto2 libexif popt;
|
||||||
};
|
};
|
||||||
|
@ -4500,7 +4508,7 @@ rec {
|
||||||
|
|
||||||
synaptics = import ../misc/synaptics {
|
synaptics = import ../misc/synaptics {
|
||||||
inherit fetchurl stdenv pkgconfig;
|
inherit fetchurl stdenv pkgconfig;
|
||||||
inherit (xlibs) libX11 libXi libXext pixman;
|
inherit (xlibs) libX11 libXi libXext pixman xf86inputevdev;
|
||||||
inherit (xorg) xorgserver;
|
inherit (xorg) xorgserver;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue