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/a52dec/builder.sh | 2 -- pkgs/development/libraries/a52dec/default.nix | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) mode change 100755 => 100644 pkgs/development/libraries/a52dec/builder.sh (limited to 'pkgs/development/libraries/a52dec') diff --git a/pkgs/development/libraries/a52dec/builder.sh b/pkgs/development/libraries/a52dec/builder.sh old mode 100755 new mode 100644 index 55367c159e3..1899153fa34 --- a/pkgs/development/libraries/a52dec/builder.sh +++ b/pkgs/development/libraries/a52dec/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh - . $stdenv/setup || exit 1 tar xvfz $src || exit 1 diff --git a/pkgs/development/libraries/a52dec/default.nix b/pkgs/development/libraries/a52dec/default.nix index 5dbd14fb64f..20692fafb26 100644 --- a/pkgs/development/libraries/a52dec/default.nix +++ b/pkgs/development/libraries/a52dec/default.nix @@ -1,10 +1,8 @@ -{stdenv, fetchurl}: derivation { +{stdenv, fetchurl}: stdenv.mkDerivation { name = "a52dec-0.7.4"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = http://liba52.sourceforge.net/files/a52dec-0.7.4.tar.gz; md5 = "caa9f5bc44232dc8aeea773fea56be80"; }; - stdenv = stdenv; } -- cgit 1.4.1