Commit e153ba4e authored by Stanislav Asunkin's avatar Stanislav Asunkin
Browse files

lua51Packages.libluv: fix build 

Upstream rockspec file now supports WITH_SHARED_LIBUV variable. This
commit uses it. Before this change, upstream value of WITH_SHARED_LIBUV
overrode the one from the inline patch, which caused a build failure.
parent 6dd3c7db

pkgs/development/lua-modules/luv/default.nix

+11 −23
Original line number Diff line number Diff line
@@ -43,31 +43,19 @@ buildLuarocksPackage rec { 
  buildInputs = [ libuv ];

  nativeBuildInputs = [ cmake ];



  # Need to specify WITH_SHARED_LIBUV=ON cmake flag, but

  # Luarocks doesn't take cmake variables from luarocks config.

  # Need to specify it in rockspec. See https://github.com/luarocks/luarocks/issues/1160.

  knownRockspec = runCommand "luv-${version}.rockspec" { } ''

    patch ${src}/luv-scm-0.rockspec -o - > $out <<'EOF'

    --- a/luv-scm-0.rockspec

    +++ b/luv-scm-0.rockspec

    @@ -1,5 +1,5 @@

     package = "luv"

    -version = "scm-0"

    +version = "${version}"

     source = {

       url = 'git://github.com/luvit/luv.git'

     }

    @@ -24,6 +24,7 @@

     build =

       type = 'cmake',

       variables = {

    +     WITH_SHARED_LIBUV="ON",

          CMAKE_C_FLAGS="$(CFLAGS)",

          CMAKE_MODULE_LINKER_FLAGS="$(LIBFLAG)",

          LUA_LIBDIR="$(LUA_LIBDIR)",

    EOF

  rockspecFilename = "luv-scm-0.rockspec";



  postConfigure = ''

    mv "$rockspecFilename" "$generatedRockspecFilename"

    rockspecFilename="$generatedRockspecFilename"

    substituteInPlace "$rockspecFilename" \

      --replace-fail 'version = "scm-0"' "version = \"$version\""

  '';



  luarocksConfig.variables = {

    WITH_SHARED_LIBUV = "ON";

  };



  __darwinAllowLocalNetworking = true;



  doInstallCheck = true;