From 12ae5363ea658d399bdb008f6ded3cde355f9310 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra 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/audiofile/builder.sh | 2 -- pkgs/development/libraries/audiofile/default.nix | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) mode change 100755 => 100644 pkgs/development/libraries/audiofile/builder.sh (limited to 'pkgs/development/libraries/audiofile') diff --git a/pkgs/development/libraries/audiofile/builder.sh b/pkgs/development/libraries/audiofile/builder.sh old mode 100755 new mode 100644 index f213ca74ebdb..43db47a8b26c --- a/pkgs/development/libraries/audiofile/builder.sh +++ b/pkgs/development/libraries/audiofile/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh - buildinputs="" . $stdenv/setup || exit 1 diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix index c39390666b43..7dc7b7c6c145 100644 --- a/pkgs/development/libraries/audiofile/default.nix +++ b/pkgs/development/libraries/audiofile/default.nix @@ -1,12 +1,10 @@ {stdenv, fetchurl}: -derivation { +stdenv.mkDerivation { name = "audiofile-0.2.3"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = http://www.68k.org/~michael/audiofile/audiofile-0.2.5.tar.gz; md5 = "fd07c62a17ceafa317929e55e51e26c5"; }; - stdenv = stdenv; } -- cgit v1.2.3