Unverified Commit 7db1e626 authored by Leona Maroni's avatar Leona Maroni Committed by GitHub
Browse files

varnish: fix cross compilation (#448440)

parents fa478f49 5bd1cdfe

pkgs/servers/varnish/default.nix

+37 −2
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
  stdenv,

  fetchurl,

  fetchpatch2,

  buildPackages,

  pcre,

  pcre2,

  jemalloc,
@@ -24,7 +25,6 @@ let 
    {

      version,

      hash,

      extraNativeBuildInputs ? [ ],

    }:

    stdenv.mkDerivation rec {

      pname = "varnish";
@@ -35,12 +35,15 @@ let 
        inherit hash;

      };



      strictDeps = true;



      nativeBuildInputs = with python3.pkgs; [

        pkg-config

        docutils

        sphinx

        makeWrapper

      ];



      buildInputs = [

        libxslt

        groff
@@ -54,6 +57,14 @@ let 
      ++ lib.optional stdenv.hostPlatform.isDarwin libunwind

      ++ lib.optional stdenv.hostPlatform.isLinux jemalloc;



      configureFlags = [

        # the checks behind those to not work when doing cross but for simplicity we always define them

        "ac_cv_have_tcp_fastopen=yes"

        "ac_cv_have_tcp_keep=yes"

        "ac_cv_have_working_close_range=yes"

        "PYTHON=${buildPackages.python3.interpreter}"

      ];



      buildFlags = [ "localstatedir=/var/run" ];



      patches =
@@ -75,11 +86,32 @@ let 
        ];



      postPatch = ''

        substituteInPlace bin/varnishtest/vtc_main.c --replace /bin/rm "${coreutils}/bin/rm"

        substituteInPlace bin/varnishtest/vtc_main.c --replace-fail /bin/rm "${coreutils}/bin/rm"

      '';



      postConfigure = lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''

        # prevent cache invalidation

        substituteInPlace bin/varnishd/Makefile \

          --replace-fail "vhp_hufdec.h: vhp_gen_hufdec" "vhp_hufdec.h:"



        ln -s "${buildPackages.varnish.vhp_hufdec_h}" bin/varnishd/vhp_hufdec.h



        substituteInPlace bin/varnishstat/Makefile \

          --replace-fail "varnishstat_curses_help.c: varnishstat_help_gen" "varnishstat_curses_help.c:" \

          --replace-fail "./varnishstat_help_gen" "${buildPackages.varnish}/bin/varnishstat_help_gen"



        # the docs execute lots of commands to gather options and flags

        substituteInPlace doc/Makefile \

          --replace-fail "SUBDIRS = graphviz sphinx" "SUBDIRS = graphviz"

        substituteInPlace Makefile \

          --replace-fail "include lib bin vmod etc doc man contrib" "include lib bin vmod etc doc contrib"

      '';



      postInstall = ''

        wrapProgram "$out/sbin/varnishd" --prefix PATH : "${lib.makeBinPath [ stdenv.cc ]}"

      ''

      + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''

        cp bin/varnishd/vhp_hufdec.h $vhp_hufdec_h

      '';



      # https://github.com/varnishcache/varnish-cache/issues/1875
@@ -88,7 +120,10 @@ let 
      outputs = [

        "out"

        "dev"

      ]

      ++ lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [

        "man"

        "vhp_hufdec_h" # only used for cross compilation

      ];



      passthru = {