summary refs log tree commit diff
path: root/pkgs/development/libraries/popt
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2005-12-06 00:12:45 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2005-12-06 00:12:45 +0000
commit94fe7734fa6d9b385ee13da1e9982a4a454c3e7a (patch)
treef504e16cdb60ed1dc7c54e00e89114dc95a55d39 /pkgs/development/libraries/popt
parent82e678362f25dfefd8c9952e4fa1ab3c1aca9ce6 (diff)
downloadnixpkgs-94fe7734fa6d9b385ee13da1e9982a4a454c3e7a.tar
nixpkgs-94fe7734fa6d9b385ee13da1e9982a4a454c3e7a.tar.gz
nixpkgs-94fe7734fa6d9b385ee13da1e9982a4a454c3e7a.tar.bz2
nixpkgs-94fe7734fa6d9b385ee13da1e9982a4a454c3e7a.tar.lz
nixpkgs-94fe7734fa6d9b385ee13da1e9982a4a454c3e7a.tar.xz
nixpkgs-94fe7734fa6d9b385ee13da1e9982a4a454c3e7a.tar.zst
nixpkgs-94fe7734fa6d9b385ee13da1e9982a4a454c3e7a.zip
* Glibc 2.3.6.
* GCC 3.4.5.
* Updated several other stdenv packages.
* Modified the builders of several packages to use the generic
  builder.

svn path=/nixpkgs/trunk/; revision=4336
Diffstat (limited to 'pkgs/development/libraries/popt')
-rw-r--r--pkgs/development/libraries/popt/builder.sh9
-rw-r--r--pkgs/development/libraries/popt/default.nix3
2 files changed, 1 insertions, 11 deletions
diff --git a/pkgs/development/libraries/popt/builder.sh b/pkgs/development/libraries/popt/builder.sh
deleted file mode 100644
index 67696b46467..00000000000
--- a/pkgs/development/libraries/popt/builder.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-buildinputs="$gettext"
-source $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd popt-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
-strip -S $out/lib/*.a || exit 1
diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/development/libraries/popt/default.nix
index e8d23dbe188..1170760c828 100644
--- a/pkgs/development/libraries/popt/default.nix
+++ b/pkgs/development/libraries/popt/default.nix
@@ -4,10 +4,9 @@ assert gettext != null;
 
 stdenv.mkDerivation {
   name = "popt-1.7";
-  builder = ./builder.sh;
   src = fetchurl {
     url = http://nix.cs.uu.nl/dist/tarballs/popt-1.7.tar.gz;
     md5 = "5988e7aeb0ae4dac8d83561265984cc9";
   };
-  gettext = gettext;
+  buildInputs = [gettext];
 }