summary refs log tree commit diff
path: root/pkgs/tools/misc
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2004-04-23 16:29:53 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2004-04-23 16:29:53 +0000
commit163a38272783e8e977198755a5ec097e9894a12c (patch)
treed7cb04624425b6d17772451f3c259f91bd1c4cdc /pkgs/tools/misc
parentec232441a2428798a9dc3d4e9b49204a92b935ed (diff)
downloadnixlib-163a38272783e8e977198755a5ec097e9894a12c.tar
nixlib-163a38272783e8e977198755a5ec097e9894a12c.tar.gz
nixlib-163a38272783e8e977198755a5ec097e9894a12c.tar.bz2
nixlib-163a38272783e8e977198755a5ec097e9894a12c.tar.lz
nixlib-163a38272783e8e977198755a5ec097e9894a12c.tar.xz
nixlib-163a38272783e8e977198755a5ec097e9894a12c.tar.zst
nixlib-163a38272783e8e977198755a5ec097e9894a12c.zip
* Don't use gettext. Also use an internal (GNU) version of getopt.
  This allows it to build on non-glibc platforms (e.g., Mac OS X).

svn path=/nixpkgs/trunk/; revision=970
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r--pkgs/tools/misc/getopt/builder.sh10
-rw-r--r--pkgs/tools/misc/getopt/default.nix4
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/tools/misc/getopt/builder.sh b/pkgs/tools/misc/getopt/builder.sh
index b086693baece..0b1da9d66123 100644
--- a/pkgs/tools/misc/getopt/builder.sh
+++ b/pkgs/tools/misc/getopt/builder.sh
@@ -1,6 +1,4 @@
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd getopt-* || exit 1
-make || exit 1
-make install prefix=$out || exit 1
+. $stdenv/setup
+installFlags="prefix=$out"
+makeFlags="CFLAGS=-DWITHOUT_GETTEXT LIBCGETOPT=0"
+genericBuild
diff --git a/pkgs/tools/misc/getopt/default.nix b/pkgs/tools/misc/getopt/default.nix
index 1e27204a5afb..b02648e8c930 100644
--- a/pkgs/tools/misc/getopt/default.nix
+++ b/pkgs/tools/misc/getopt/default.nix
@@ -1,4 +1,6 @@
-{stdenv, fetchurl}: stdenv.mkDerivation {
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
   name = "getopt-1.1.3";
   builder = ./builder.sh;
   src = fetchurl {