From a322687423dc1370f6d6ffb554ebe3bad07d0be5 Mon Sep 17 00:00:00 2001 From: third3ye Date: Mon, 16 Jun 2014 05:24:24 +0200 Subject: [PATCH] Application.ini does not refer correctly The "Application.ini" provided with Thunderbird does not correctly set the path to the icon location. Visa vi it refers to '$out/lib/thunderbird-17.0.11esr', which doesn't exist, but '$out/lib/thunderbird-17.0.11' does. To remedy this problem I added a new variable called 'verName" which adds 'esr' after the variable '$version'. Then change the variables necessary so that the build process sets working references. Fuuzetsu suggested putting the verName variable inside of mkDerivation. I cannot surmise. --- .../networking/mailreaders/thunderbird/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 3a8dab10ff2..85dab3777ba 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -12,13 +12,14 @@ enableOfficialBranding ? false }: -let version = "17.0.11esr"; in +let version = "17.0.11"; in +let verName = "${version}esr"; in stdenv.mkDerivation { - name = "thunderbird-${version}"; + name = "thunderbird-${verName}"; src = fetchurl { - url = "ftp://ftp.mozilla.org/pub/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2"; + url = "ftp://ftp.mozilla.org/pub/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.bz2"; sha256 = "1m2lph8x82kgxqzlyaxr1l1x7s4qnqfzfnqck4b777914mrv1mdp"; };