From f27ed66a5cb2739f89e88747773d54c95313cb4f Mon Sep 17 00:00:00 2001 From: taku0 Date: Sat, 30 Jan 2021 19:58:55 +0900 Subject: [PATCH] thunderbird-bin: change from name to pname + version --- .../networking/mailreaders/thunderbird-bin/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index b1905359cd3..f9027285c13 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -63,12 +63,11 @@ let defaultSource = lib.findFirst (sourceMatches "en-US") {} sources; source = lib.findFirst (sourceMatches systemLocale) defaultSource sources; - - name = "thunderbird-bin-${version}"; in stdenv.mkDerivation { - inherit name; + pname = "thunderbird-bin"; + inherit version; src = fetchurl { url = "https://download-installer.cdn.mozilla.net/pub/thunderbird/releases/${version}/${source.arch}/${source.locale}/thunderbird-${version}.tar.bz2"; @@ -169,7 +168,8 @@ stdenv.mkDerivation { ''; passthru.updateScript = import ./../../browsers/firefox-bin/update.nix { - inherit name writeScript xidel coreutils gnused gnugrep curl gnupg runtimeShell; + inherit writeScript xidel coreutils gnused gnugrep curl gnupg runtimeShell; + name = "thunderbird-bin-${version}"; baseName = "thunderbird"; channel = "release"; basePath = "pkgs/applications/networking/mailreaders/thunderbird-bin";