diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2020-11-29 13:26:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-29 13:26:40 +0100 |
| commit | db29c15173d23c1574d618cfc05dae63f85c315e (patch) | |
| tree | ab4eac89f585d85710bdfb0925787fb058f91280 /pkgs/applications/networking/mailreaders | |
| parent | da817c1a98cf4cc3654dbeff88254e7bc5219f2d (diff) | |
| parent | b65a1ab2a4d2e4d34f41e94ef59f2479561bd5c9 (diff) | |
| download | nixlib-db29c15173d23c1574d618cfc05dae63f85c315e.tar nixlib-db29c15173d23c1574d618cfc05dae63f85c315e.tar.gz nixlib-db29c15173d23c1574d618cfc05dae63f85c315e.tar.bz2 nixlib-db29c15173d23c1574d618cfc05dae63f85c315e.tar.lz nixlib-db29c15173d23c1574d618cfc05dae63f85c315e.tar.xz nixlib-db29c15173d23c1574d618cfc05dae63f85c315e.tar.zst nixlib-db29c15173d23c1574d618cfc05dae63f85c315e.zip | |
Merge pull request #105151 from B4dM4n/copy-desktop-hook
copyDesktopItems: add new setup-hook
Diffstat (limited to 'pkgs/applications/networking/mailreaders')
| -rw-r--r-- | pkgs/applications/networking/mailreaders/thunderbird/68.nix | 13 | ||||
| -rw-r--r-- | pkgs/applications/networking/mailreaders/thunderbird/default.nix | 14 |
2 files changed, 15 insertions, 12 deletions
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/68.nix b/pkgs/applications/networking/mailreaders/thunderbird/68.nix index ee5b7c5e17b0..60dc12054841 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/68.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/68.nix @@ -4,6 +4,7 @@ , bzip2 , cargo , common-updater-scripts +, copyDesktopItems , coreutils , curl , dbus @@ -83,6 +84,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf213 cargo + copyDesktopItems gnused llvmPackages.llvm m4 @@ -262,8 +264,8 @@ stdenv.mkDerivation rec { doCheck = false; - postInstall = let - desktopItem = makeDesktopItem { + desktopItems = [ + (makeDesktopItem { categories = lib.concatStringsSep ";" [ "Application" "Network" ]; desktopName = "Thunderbird"; genericName = "Mail Reader"; @@ -283,12 +285,11 @@ stdenv.mkDerivation rec { "x-scheme-handler/snews" "x-scheme-handler/nntp" ]; - }; - in '' + }) + ]; + postInstall = '' # TODO: Move to a dev output? rm -rf $out/include $out/lib/thunderbird-devel-* $out/share/idl - - ${desktopItem.buildCommand} ''; preFixup = '' diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index fa229b8d7df4..b692fe7d9c88 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -2,6 +2,7 @@ , bzip2 , cargo , common-updater-scripts +, copyDesktopItems , coreutils , curl , dbus @@ -82,6 +83,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf213 cargo + copyDesktopItems gnused llvmPackages.llvm m4 @@ -257,8 +259,8 @@ stdenv.mkDerivation rec { doCheck = false; - postInstall = let - desktopItem = makeDesktopItem { + desktopItems = [ + (makeDesktopItem { categories = lib.concatStringsSep ";" [ "Application" "Network" ]; desktopName = "Thunderbird"; genericName = "Mail Reader"; @@ -278,12 +280,12 @@ stdenv.mkDerivation rec { "x-scheme-handler/snews" "x-scheme-handler/nntp" ]; - }; - in '' + }) + ]; + + postInstall = '' # TODO: Move to a dev output? rm -rf $out/include $out/lib/thunderbird-devel-* $out/share/idl - - ${desktopItem.buildCommand} ''; preFixup = '' |