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/tools/archivers/zip/builder.sh  | 2 --
 pkgs/tools/archivers/zip/default.nix | 4 +---
 2 files changed, 1 insertion(+), 5 deletions(-)
 mode change 100755 => 100644 pkgs/tools/archivers/zip/builder.sh

(limited to 'pkgs/tools/archivers/zip')

diff --git a/pkgs/tools/archivers/zip/builder.sh b/pkgs/tools/archivers/zip/builder.sh
old mode 100755
new mode 100644
index b68fdfe32b83..04fb0ec967f8
--- a/pkgs/tools/archivers/zip/builder.sh
+++ b/pkgs/tools/archivers/zip/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 . $stdenv/setup || exit 1
 
 tar xvfz $src || exit 1
diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix
index 7b4ea02fb405..d5f8f910a7e8 100644
--- a/pkgs/tools/archivers/zip/default.nix
+++ b/pkgs/tools/archivers/zip/default.nix
@@ -1,10 +1,8 @@
-{stdenv, fetchurl}: derivation {
+{stdenv, fetchurl}: stdenv.mkDerivation {
   name = "zip-2.3";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.info-zip.org/pub/infozip/src/zip23.tar.gz;
     md5 = "5206a99541f3b0ab90f1baa167392c4f";
   };
-  stdenv = stdenv;
 }
-- 
cgit 1.4.1