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

thunderbird: use copyDesktopItems hook

Browse Source
This commit is contained in:
Fabian Möller 2020-11-27 13:42:09 +01:00 committed by Milan Pässler
parent 65f8183685
commit c3598cc7d3
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/networking/mailreaders/thunderbird/68.nix
View File

@ -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 = ''

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

@ -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 = ''