Unverified Commit cff65783 authored by Azat Bahawi's avatar Azat Bahawi Committed by GitHub
Browse files

nginxModules.njs: Fix build, 0.8.7 -> 0.8.9 (#387639)

parents bb3ff838 a907e4e0

pkgs/servers/http/nginx/modules.nix

+8 −5
Original line number Diff line number Diff line 
{ lib

, config

, nixosTests

, fetchFromGitHub

, fetchFromGitLab

, fetchhg
@@ -509,8 +510,8 @@ let self = { 
    src = fetchFromGitHub {

      owner = "nginx";

      repo = "njs";

      rev = "0.8.7";

      hash = "sha256-VEXzP+cN5hnDeniccwY7GIi4x460rnWO/o7ja3DyRCc=";

      rev = "0.8.9";

      hash = "sha256-TalS9EJP+vB1o3BKaTvXXnudjKhNOcob3kDAyeKej3c=";

    };



    # njs module sources have to be writable during nginx build, so we copy them
@@ -520,17 +521,19 @@ let self = { 
      mkdir -p "$(dirname "$NJS_SOURCE_DIR")"

      cp --recursive "${src}" "$NJS_SOURCE_DIR"

      chmod -R u+rwX,go+rX "$NJS_SOURCE_DIR"

      export configureFlags="''${configureFlags/"${src}"/"$NJS_SOURCE_DIR/nginx"}"

      export configureFlags="''${configureFlags/"${src}"/"$NJS_SOURCE_DIR/nginx"} --with-ld-opt='-lz'"

      unset NJS_SOURCE_DIR

    '';



    inputs = [ which ];

    inputs = [ which zlib ];



    passthru.tests = nixosTests.nginx-njs;



    meta = with lib; {

      description = "Subset of the JavaScript language that allows extending nginx functionality";

      homepage = "https://nginx.org/en/docs/njs/";

      license = with licenses; [ bsd2 ];

      maintainers = [ ];

      maintainers = with maintainers; [ jvanbruegge ];

    };

  };