From bc46eaf4047f4cfd3152f3748f114b8743ed4faf Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 18 Jan 2008 12:36:56 +0000
Subject: Some review of builder-defs and dependent files. No rebuild needed.
 Now it should be possible to override elements in builderDefs

svn path=/nixpkgs/trunk/; revision=10214
---
 pkgs/applications/audio/ladspa-plugins/default.nix | 5 +++--
 pkgs/applications/audio/ladspa-plugins/ladspah.nix | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'pkgs/applications/audio/ladspa-plugins')

diff --git a/pkgs/applications/audio/ladspa-plugins/default.nix b/pkgs/applications/audio/ladspa-plugins/default.nix
index 70dc36240c6..9553474791f 100644
--- a/pkgs/applications/audio/ladspa-plugins/default.nix
+++ b/pkgs/applications/audio/ladspa-plugins/default.nix
@@ -1,5 +1,5 @@
 args: with args;
-	with (builderDefs {
+	let localDefs = builderDefs {
 		src = 
 		fetchurl {
 			url = http://plugin.org.uk/releases/0.4.15/swh-plugins-0.4.15.tar.gz;
@@ -8,6 +8,7 @@ args: with args;
 		buildInputs = [fftw ladspaH pkgconfig];
 		configureFlags = [];
 	} null);
+	in with localDefs;
 let
 	postInstall = FullDepEntry ("
 		ensureDir \$out/share/ladspa/
@@ -17,7 +18,7 @@ in
 stdenv.mkDerivation {
 	name = "swh-plugins-0.4.15";
 	builder = writeScript "swh-plugins-0.4.15-builder"
-		(textClosure [doConfigure doMakeInstall 
+		(textClosure localDefs [doConfigure doMakeInstall 
 			postInstall doForceShare]);
 	meta = {
 		description = "
diff --git a/pkgs/applications/audio/ladspa-plugins/ladspah.nix b/pkgs/applications/audio/ladspa-plugins/ladspah.nix
index b526e48b10e..65647cf0a22 100644
--- a/pkgs/applications/audio/ladspa-plugins/ladspah.nix
+++ b/pkgs/applications/audio/ladspa-plugins/ladspah.nix
@@ -6,10 +6,11 @@ let
 		sha256 = "1b908csn85ng9sz5s5d1mqk711cmawain2z8px2ajngihdrynb67";
 	};
 in
-	with builderDefs {
+	let localDefs = builderDefs {
 		buildInputs = [];
 		inherit src;
 	} null;
+	in with localDefs;
 let
 	copyFile = FullDepEntry ("
 		ensureDir \$out/include
@@ -19,7 +20,7 @@ in
 stdenv.mkDerivation {
 	name = "ladspa.h";
 	builder = writeScript "ladspa.h-builder"
-		(textClosure [copyFile]);
+		(textClosure localDefs [copyFile]);
 	meta = {
 		description = "
 	LADSPA format audio plugins.
-- 
cgit 1.4.1