public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests 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 , bzip2
, cargo , cargo
, common-updater-scripts , common-updater-scripts
, copyDesktopItems
, coreutils , coreutils
, curl , curl
, dbus , dbus
@ -83,6 +84,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
autoconf213 autoconf213
cargo cargo
copyDesktopItems
gnused gnused
llvmPackages.llvm llvmPackages.llvm
m4 m4
@ -262,8 +264,8 @@ stdenv.mkDerivation rec {
doCheck = false; doCheck = false;
postInstall = let desktopItems = [
desktopItem = makeDesktopItem { (makeDesktopItem {
categories = lib.concatStringsSep ";" [ "Application" "Network" ]; categories = lib.concatStringsSep ";" [ "Application" "Network" ];
desktopName = "Thunderbird"; desktopName = "Thunderbird";
genericName = "Mail Reader"; genericName = "Mail Reader";
@ -283,12 +285,11 @@ stdenv.mkDerivation rec {
"x-scheme-handler/snews" "x-scheme-handler/snews"
"x-scheme-handler/nntp" "x-scheme-handler/nntp"
]; ];
}; })
in '' ];
postInstall = ''
# TODO: Move to a dev output? # TODO: Move to a dev output?
rm -rf $out/include $out/lib/thunderbird-devel-* $out/share/idl rm -rf $out/include $out/lib/thunderbird-devel-* $out/share/idl
${desktopItem.buildCommand}
''; '';
preFixup = '' preFixup = ''

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

@ -2,6 +2,7 @@
, bzip2 , bzip2
, cargo , cargo
, common-updater-scripts , common-updater-scripts
, copyDesktopItems
, coreutils , coreutils
, curl , curl
, dbus , dbus
@ -82,6 +83,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
autoconf213 autoconf213
cargo cargo
copyDesktopItems
gnused gnused
llvmPackages.llvm llvmPackages.llvm
m4 m4
@ -257,8 +259,8 @@ stdenv.mkDerivation rec {
doCheck = false; doCheck = false;
postInstall = let desktopItems = [
desktopItem = makeDesktopItem { (makeDesktopItem {
categories = lib.concatStringsSep ";" [ "Application" "Network" ]; categories = lib.concatStringsSep ";" [ "Application" "Network" ];
desktopName = "Thunderbird"; desktopName = "Thunderbird";
genericName = "Mail Reader"; genericName = "Mail Reader";
@ -278,12 +280,12 @@ stdenv.mkDerivation rec {
"x-scheme-handler/snews" "x-scheme-handler/snews"
"x-scheme-handler/nntp" "x-scheme-handler/nntp"
]; ];
}; })
in '' ];
postInstall = ''
# TODO: Move to a dev output? # TODO: Move to a dev output?
rm -rf $out/include $out/lib/thunderbird-devel-* $out/share/idl rm -rf $out/include $out/lib/thunderbird-devel-* $out/share/idl
${desktopItem.buildCommand}
''; '';
preFixup = '' preFixup = ''