Unverified Commit 98a9b6e6 authored by Peter Hoeg's avatar Peter Hoeg Committed by GitHub
Browse files

webfs: 1.21 -> 1.21-unstable-2021-02-24 (#336497)

parent a109ffd1
Loading
Loading
Loading
Loading

pkgs/by-name/we/webfs/ls.c.patch

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line
# Source: homebrew
# https://raw.githubusercontent.com/Homebrew/patches/0518a6d1/webfs/patch-ls.c
--- ./ls.c.orig	Fri Oct 15 14:20:50 2004
+++ ./ls.c	Fri Oct 15 14:21:13 2004
@@ -160,7 +160,7 @@
     return buf;
 }
 
-#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
+#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__APPLE__)
 static void strmode(mode_t mode, char *dest)
 {
     static const char *rwx[] = {
+19 −20
Original line number Diff line number Diff line
{ lib, 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 {
{ lib, stdenv, fetchFromGitHub, mailcap, openssl }:

stdenv.mkDerivation {
  pname = "webfs";
  version = "1.21";
  version = "1.21-unstable-2021-02-24";

  src = fetchurl {
    url = "https://www.kraxel.org/releases/webfs/webfs-${version}.tar.gz";
    sha256 = "98c1cb93473df08e166e848e549f86402e94a2f727366925b1c54ab31064a62a";
  src = fetchFromGitHub {
    owner = "ourway";
    repo = "webfsd";
    rev = "228affae0774251c6925372d465eb4e648327879";
    hash = "sha256-uTo9f66cOKSsIGLUj1E/ywMXT1peekb93UlFBrfkpN0=";
  };

  patches = [ ./ls.c.patch ];

  buildInputs = [ openssl ];

  makeFlags = [
    "mimefile=${mime_file}"
    "prefix=$(out)"
    "mimefile=${placeholder "out"}/etc/mime.types"
    "prefix=${placeholder "out"}"
    "USE_THREADS=yes"
  ];

  postInstall = ''
    install -Dm444 -t $out/etc ${mailcap}/etc/mime.types
  '';

  meta = with lib; {
    description = "HTTP server for purely static content";
    homepage = "http://linux.bytesex.org/misc/webfs.html";