public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* Propagate name automatically.

svn path=/nixpkgs/trunk/; revision=1409
This commit is contained in:
Eelco Dolstra 2004-09-16 12:38:10 +00:00
parent c1ecf16402
commit 5808ac7148
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/networking/mailreaders/thunderbird/default.nix
View File

@ -6,7 +6,7 @@ assert pkgconfig != null && gtk != null && perl != null
# !!! assert libIDL.glib == gtk.glib; # !!! assert libIDL.glib == gtk.glib;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "thunderbird-code-0.8"; name = "thunderbird-0.8";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {

6
pkgs/applications/networking/mailreaders/thunderbird/linker.nix
View File

@ -1,6 +0,0 @@
{name, stdenv, dir, files}:
stdenv.mkDerivation {
inherit name dir files;
builder = ./linker.sh;
}

0
pkgs/applications/networking/mailreaders/thunderbird/linker.sh → pkgs/build-support/make-symlinks/builder.sh
View File

7
pkgs/build-support/make-symlinks/default.nix Normal file
View File

@ -0,0 +1,7 @@
{name ? "", stdenv, dir, files}:
stdenv.mkDerivation {
inherit dir files;
name = if name == "" then dir.name else name;
builder = ./builder.sh;
}

5
pkgs/system/all-packages-generic.nix
View File

@ -755,8 +755,8 @@ rec {
}; };
thunderbird = thunderbird =
(import ../applications/networking/mailreaders/thunderbird/linker.nix) { (import ../build-support/make-symlinks) {
name = "thunderbird-0.8"; inherit stdenv;
dir = dir =
(import ../applications/networking/mailreaders/thunderbird) { (import ../applications/networking/mailreaders/thunderbird) {
inherit fetchurl stdenv pkgconfig perl zip; inherit fetchurl stdenv pkgconfig perl zip;
@ -764,7 +764,6 @@ rec {
inherit (gnome) libIDL; inherit (gnome) libIDL;
}; };
files = ["bin/thunderbird" "lib/thunderbird-0.8/icons"]; files = ["bin/thunderbird" "lib/thunderbird-0.8/icons"];
inherit stdenv;
}; };
lynx = (import ../applications/networking/browsers/lynx) { lynx = (import ../applications/networking/browsers/lynx) {