From 163a38272783e8e977198755a5ec097e9894a12c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 23 Apr 2004 16:29:53 +0000 Subject: [PATCH] * 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 --- pkgs/tools/misc/getopt/builder.sh | 10 ++++------ pkgs/tools/misc/getopt/default.nix | 4 +++- 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 {