* Renamed Martin's linker derivation to `make-symlinks'.

* Propagate name automatically.

svn path=/nixpkgs/trunk/; revision=1409

3 files changed, 1 insertions, 16 deletions

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 4af7937c45afa..92b821f522954 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 20e26de80fffe..0000000000000
--- 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/applications/networking/mailreaders/thunderbird/linker.sh
deleted file mode 100644
index b79e2039bfec8..0000000000000
--- a/pkgs/applications/networking/mailreaders/thunderbird/linker.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-. $stdenv/setup
-
-mkdir $out
-for file in $files
-do
-  subdir=`dirname $file`
-  mkdir -p $out/$subdir
-  ln -s $dir/$file $out/$file
-done