diff options
author | Aristid Breitkreuz <aristidb@gmail.com> | 2015-11-29 00:26:25 +0100 |
---|---|---|
committer | Aristid Breitkreuz <aristidb@gmail.com> | 2015-11-29 00:26:25 +0100 |
commit | bd826685295aab80f9ccc64565a21a4b18713755 (patch) | |
tree | 43f523a7325e079ebeba9e1e8d300108440ff4f0 /pkgs | |
parent | 903053e332625e3d690f7976eef9aefe5f44ac2f (diff) | |
parent | 138a42dd11f520b114cbc1727b6f6f0825680b1d (diff) |
Merge pull request #11324 from zimbatm/fix/webfs-mime
webfs: fix mime types
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/servers/http/webfs/default.nix | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/servers/http/webfs/default.nix b/pkgs/servers/http/webfs/default.nix index b306c73f4a50a..3fb3890f9c4e9 100644 --- a/pkgs/servers/http/webfs/default.nix +++ b/pkgs/servers/http/webfs/default.nix @@ -1,4 +1,11 @@ -{ stdenv, fetchurl, openssl, shared_mime_info }: +{ stdenv, fetchurl, openssl }: +let + # Let's not pull the whole apache httpd package + mime_file = fetchurl { + url = https://raw.githubusercontent.com/apache/httpd/906e419c1f703360e2e8ec077b393347f993884f/docs/conf/mime.types; + sha256 = "ef972fc545cbff4c0daa2b2e6b440859693b3c10435ee90f10fa6fffad800c16"; + }; +in stdenv.mkDerivation rec { name = "webfs-${version}"; version = "1.21"; @@ -13,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ]; makeFlags = [ - "mimefile=${shared_mime_info}/share/mime/globs" + "mimefile=${mime_file}" "prefix=$(out)" ]; |