Merge pull request #176291 from SuperSandro2000/cacert-mailcap

This commit is contained in:
Artturi 2022-06-07 03:38:13 +03:00 committed by GitHub
commit 6919d2ed24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 11 deletions

View File

@ -1,23 +1,25 @@
{ lib, fetchzip }: { lib, stdenv, fetchurl }:
let stdenv.mkDerivation rec {
pname = "mailcap";
version = "2.1.53"; version = "2.1.53";
in fetchzip { src = fetchurl {
name = "mailcap-${version}"; url = "https://releases.pagure.org/mailcap/mailcap-${version}.tar.xz";
sha256 = "sha256-Xuou8XswSXe6PsuHr61DGfoEQPgl5Pb7puj6L/64h4U=";
};
url = "https://releases.pagure.org/mailcap/mailcap-${version}.tar.xz"; installPhase = ''
sha256 = "sha256-6JPj2tZgoTEZ8hNEi9ZZhElBNm9SRTSXifMmCicwiLo="; runHook preInstall
postFetch = ''
tar -xavf $downloadedFile --strip-components=1
substituteInPlace mailcap --replace "/usr/bin/" "" substituteInPlace mailcap --replace "/usr/bin/" ""
gzip mailcap.5
sh generate-nginx-mimetypes.sh < mime.types > nginx-mime.types sh generate-nginx-mimetypes.sh < mime.types > nginx-mime.types
install -D -m0644 nginx-mime.types $out/etc/nginx/mime.types install -D -m0644 nginx-mime.types $out/etc/nginx/mime.types
install -D -m0644 -t $out/etc mailcap mime.types install -D -m0644 -t $out/etc mailcap mime.types
install -D -m0644 -t $out/share/man/man5 mailcap.5.gz install -D -m0644 -t $out/share/man/man5 mailcap.5
runHook postInstall
''; '';
meta = with lib; { meta = with lib; {

View File

@ -24118,7 +24118,10 @@ with pkgs;
brise = callPackage ../data/misc/brise { }; brise = callPackage ../data/misc/brise { };
cacert = callPackage ../data/misc/cacert { }; cacert = callPackage ../data/misc/cacert {
# avoid an infinite recursion through mailcap
buildcatrust = with python3Minimal.pkgs; toPythonApplication buildcatrust;
};
caladea = callPackage ../data/fonts/caladea {}; caladea = callPackage ../data/fonts/caladea {};