From 12ae5363ea658d399bdb008f6ded3cde355f9310 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 29 Mar 2004 17:23:01 +0000
Subject: * Remove trivial builders. * Make builders unexecutable by removing
 the hash-bang line and   execute permission. * Convert calls to `derivation'
 to `mkDerivation'. * Remove `system' and `stdenv' attributes from calls to  
 `mkDerivation'.  These transformations were all done automatically,   so it
 is quite possible I broke stuff. * Put the `mkDerivation' function in
 stdenv/generic.

svn path=/nixpkgs/trunk/; revision=874
---
 pkgs/development/libraries/pcre/builder.sh  | 3 ---
 pkgs/development/libraries/pcre/default.nix | 5 +----
 2 files changed, 1 insertion(+), 7 deletions(-)
 delete mode 100755 pkgs/development/libraries/pcre/builder.sh

(limited to 'pkgs/development/libraries/pcre')

diff --git a/pkgs/development/libraries/pcre/builder.sh b/pkgs/development/libraries/pcre/builder.sh
deleted file mode 100755
index a73f5a6d5b8dc..0000000000000
--- a/pkgs/development/libraries/pcre/builder.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh -e
-. $stdenv/setup
-genericBuild
diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix
index 5b98a264e3ca2..9c5e3c67282b9 100644
--- a/pkgs/development/libraries/pcre/default.nix
+++ b/pkgs/development/libraries/pcre/default.nix
@@ -1,12 +1,9 @@
 {stdenv, fetchurl}:
 
-derivation {
+stdenv.mkDerivation {
   name = "pcre-4.3";
-  system = stdenv.system;
-  builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-4.3.tar.bz2;
     md5 = "7bc7d5b590a41e6f9ede30f272002a02";
   };
-  inherit stdenv;
 }
-- 
cgit 1.4.1