~ehmry/sigil

8b3b6fcc73af19cc65f4ce2c4f747b42a8876205 — Emery Hemingway 3 years ago 2cee803 reinit
Apply Genode Labs patches to lighttpd
3 files changed, 18 insertions(+), 1 deletions(-)

M overlay/default.nix
M packages/genodelabs/depot-targets.nix
M packages/genodelabs/ports.nix
M overlay/default.nix => overlay/default.nix +11 -0
@@ 103,6 103,17 @@ in {
    libvpx = null;
  } libtoxcore;

  lighttpd = let
    patchDir =
      "${final.genodePackages.genodeSources}/repos/ports/src/app/lighttpd";
  in overrideAttrsHost (attrs: {
    postPatch = ''
      for p in ${patchDir}/*.patch; do
        patch -p3 $p
      done
    '';
  }) lighttpd;

  llvmPackages_11 = callPackage ./llvm-11 ({
    inherit (stdenvAdapters) overrideCC;
    buildLlvmTools = buildPackages.llvmPackages_11.tools;

M packages/genodelabs/depot-targets.nix => packages/genodelabs/depot-targets.nix +6 -1
@@ 118,7 118,12 @@ in {
  libsparkcrypto = { };
  libssh.portInputs = with ports; [ libc libssh openssl zlib ];
  libssl.portInputs = with ports; [ libc openssl ];
  lighttpd = { };
  lighttpd = {
    portInputs = with ports; [ libc lighttpd openssl zlib ];
    postInstall = ''
      ln -s $out/bin $out/sbin
    '';
  };
  linux_nic_drv.HOST_INC_DIR = [ hostLibcInc ];
  linux_rtc_drv = { };
  loader = { };

M packages/genodelabs/ports.nix => packages/genodelabs/ports.nix +1 -0
@@ 37,6 37,7 @@ with pkgs;
  libiconv.hash = "sha256-25YcW5zo1fE33ZolGQroR+KZO8wHEdN1QXa7+MhwS78=";
  libpng.hash = "sha256-hNmSWN4gEk4UIjzkGD4j5qFooMCVXLwcBeOeFumvh+4=";
  libssh.hash = "sha256-Z/1YdhISh2kqBjWiTOLkS+usoeeekJvAuYrVUgpxnQM=";
  lighttpd.hash = "sha256-kEP4Q7rBhN9D77008pkOlnj7sWhk1gbiokzOGGDs2PM=";
  lwip.hash = "sha256-RZsqy9iKiUfQzQOrPw2QWiKS5BkVbGe4HseF2DzeWeQ=";
  lz4.hash = "sha256-nydkAbexaqcKYDzp0TsECKMXyPaoY9rf3MAbU33VPrg=";
  mesa = {