From 5808ac7148850a79d9ff59e37368bdd13f187adf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 16 Sep 2004 12:38:10 +0000
Subject: [PATCH] * Renamed Martin's linker derivation to `make-symlinks'. *
 Propagate name automatically.

svn path=/nixpkgs/trunk/; revision=1409
---
 .../networking/mailreaders/thunderbird/default.nix         | 2 +-
 .../networking/mailreaders/thunderbird/linker.nix          | 6 ------
 .../linker.sh => build-support/make-symlinks/builder.sh}   | 0
 pkgs/build-support/make-symlinks/default.nix               | 7 +++++++
 pkgs/system/all-packages-generic.nix                       | 5 ++---
 5 files changed, 10 insertions(+), 10 deletions(-)
 delete mode 100644 pkgs/applications/networking/mailreaders/thunderbird/linker.nix
 rename pkgs/{applications/networking/mailreaders/thunderbird/linker.sh => build-support/make-symlinks/builder.sh} (100%)
 create mode 100644 pkgs/build-support/make-symlinks/default.nix

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 4af7937c45af..92b821f52295 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -6,7 +6,7 @@ assert pkgconfig != null && gtk != null && perl != null
 # !!! assert libIDL.glib == gtk.glib;
 
 stdenv.mkDerivation {
-  name = "thunderbird-code-0.8";
+  name = "thunderbird-0.8";
 
   builder = ./builder.sh;
   src = fetchurl {
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/linker.nix b/pkgs/applications/networking/mailreaders/thunderbird/linker.nix
deleted file mode 100644
index 20e26de80fff..000000000000
--- a/pkgs/applications/networking/mailreaders/thunderbird/linker.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{name, stdenv, dir, files}:
-
-stdenv.mkDerivation {
-  inherit name dir files;
-  builder = ./linker.sh;
-}
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/linker.sh b/pkgs/build-support/make-symlinks/builder.sh
similarity index 100%
rename from pkgs/applications/networking/mailreaders/thunderbird/linker.sh
rename to pkgs/build-support/make-symlinks/builder.sh
diff --git a/pkgs/build-support/make-symlinks/default.nix b/pkgs/build-support/make-symlinks/default.nix
new file mode 100644
index 000000000000..30584aceb9f8
--- /dev/null
+++ b/pkgs/build-support/make-symlinks/default.nix
@@ -0,0 +1,7 @@
+{name ? "", stdenv, dir, files}:
+
+stdenv.mkDerivation {
+  inherit dir files;
+  name = if name == "" then dir.name else name;
+  builder = ./builder.sh;
+}
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 973f8431613b..23417fc818b6 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -755,8 +755,8 @@ rec {
   };
 
   thunderbird = 
-    (import ../applications/networking/mailreaders/thunderbird/linker.nix) {
-      name = "thunderbird-0.8";
+    (import ../build-support/make-symlinks) {
+      inherit stdenv;
       dir =
         (import ../applications/networking/mailreaders/thunderbird) {
           inherit fetchurl stdenv pkgconfig perl zip;
@@ -764,7 +764,6 @@ rec {
           inherit (gnome) libIDL;
         };
       files = ["bin/thunderbird" "lib/thunderbird-0.8/icons"];
-      inherit stdenv;
     };
 
   lynx = (import ../applications/networking/browsers/lynx) {