From ba498d4a43971c454a183e407e26e7803fbf8612 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 29 Jul 2010 08:21:21 +0000
Subject: * composedArgsAndFun -> makeOverridable for consistency. * Rename a
 few single-version packages to "default.nix".

svn path=/nixpkgs/trunk/; revision=22803
---
 pkgs/applications/networking/p2p/ldcpp/1.0.3.nix   | 29 ----------------------
 pkgs/applications/networking/p2p/ldcpp/default.nix | 29 ++++++++++++++++++++++
 2 files changed, 29 insertions(+), 29 deletions(-)
 delete mode 100644 pkgs/applications/networking/p2p/ldcpp/1.0.3.nix
 create mode 100644 pkgs/applications/networking/p2p/ldcpp/default.nix

(limited to 'pkgs/applications/networking/p2p')

diff --git a/pkgs/applications/networking/p2p/ldcpp/1.0.3.nix b/pkgs/applications/networking/p2p/ldcpp/1.0.3.nix
deleted file mode 100644
index 52491aa29fbe..000000000000
--- a/pkgs/applications/networking/p2p/ldcpp/1.0.3.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-args : with args; with builderDefs;
-	let localDefs = builderDefs.passthru.function ((rec {
-		src = /* put a fetchurl here */
-		fetchurl {
-			url = http://launchpad.net/linuxdcpp/1.0/1.0.3/+download/linuxdcpp-1.0.3.tar.bz2;
-			sha256 = "0w9c8k13cl85y4v4av8ic6w4zkdivcj6p5q86llfh3sz077vckiv";
-		};
-
-		buildInputs = [scons pkgconfig gtk bzip2 pkgconfig libglade
-			openssl libX11];
-		configureFlags = [];
-		doScons = fullDepEntry (''
-			ensureDir $out
-			export NIX_LDFLAGS="$NIX_LDFLAGS -lX11";
-			scons PREFIX=$out 
-			scons PREFIX=$out install
-		'') ["minInit" "doUnpack" "addInputs" "defEnsureDir"];
-	}) //  args);
-	in with localDefs;
-stdenv.mkDerivation rec {
-	name = "ldcpp-1.0.3";
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs 
-			[doScons doForceShare doPropagate]);
-	meta = {
-		description = "Linux DC++ - Direct Connect client";
-		inherit src;
-	};
-}
diff --git a/pkgs/applications/networking/p2p/ldcpp/default.nix b/pkgs/applications/networking/p2p/ldcpp/default.nix
new file mode 100644
index 000000000000..52491aa29fbe
--- /dev/null
+++ b/pkgs/applications/networking/p2p/ldcpp/default.nix
@@ -0,0 +1,29 @@
+args : with args; with builderDefs;
+	let localDefs = builderDefs.passthru.function ((rec {
+		src = /* put a fetchurl here */
+		fetchurl {
+			url = http://launchpad.net/linuxdcpp/1.0/1.0.3/+download/linuxdcpp-1.0.3.tar.bz2;
+			sha256 = "0w9c8k13cl85y4v4av8ic6w4zkdivcj6p5q86llfh3sz077vckiv";
+		};
+
+		buildInputs = [scons pkgconfig gtk bzip2 pkgconfig libglade
+			openssl libX11];
+		configureFlags = [];
+		doScons = fullDepEntry (''
+			ensureDir $out
+			export NIX_LDFLAGS="$NIX_LDFLAGS -lX11";
+			scons PREFIX=$out 
+			scons PREFIX=$out install
+		'') ["minInit" "doUnpack" "addInputs" "defEnsureDir"];
+	}) //  args);
+	in with localDefs;
+stdenv.mkDerivation rec {
+	name = "ldcpp-1.0.3";
+	builder = writeScript (name + "-builder")
+		(textClosure localDefs 
+			[doScons doForceShare doPropagate]);
+	meta = {
+		description = "Linux DC++ - Direct Connect client";
+		inherit src;
+	};
+}
-- 
cgit 1.4.1