mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 08:23:09 +00:00
* Renamed Martin's linker derivation to `make-symlinks'.
* Propagate name automatically. svn path=/nixpkgs/trunk/; revision=1409
This commit is contained in:
parent
c1ecf16402
commit
5808ac7148
@ -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 {
|
||||
|
@ -1,6 +0,0 @@
|
||||
{name, stdenv, dir, files}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
inherit name dir files;
|
||||
builder = ./linker.sh;
|
||||
}
|
7
pkgs/build-support/make-symlinks/default.nix
Normal file
7
pkgs/build-support/make-symlinks/default.nix
Normal 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;
|
||||
}
|
@ -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) {
|
||||
|
Loading…
Reference in New Issue
Block a user