diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix index aeab7b2a040c..2f2cb10cce7f 100644 --- a/pkgs/development/libraries/re2/default.nix +++ b/pkgs/development/libraries/re2/default.nix @@ -1,24 +1,24 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { name = "re2-${version}"; - version = "20140304"; + version = "20190401"; - src = fetchurl { - url = "https://re2.googlecode.com/files/${name}.tgz"; - sha256 = "19wn0472c9dsxp35d0m98hlwhngx1f2xhxqgr8cb5x72gnjx3zqb"; + src = fetchFromGitHub { + owner = "google"; + repo = "re2"; + rev = "2019-04-01"; + sha256 = "018b8z3fgcr02rmhxdz80r363k40938cbgmk1c9b46k6xkc4q0hd"; }; preConfigure = '' substituteInPlace Makefile --replace "/usr/local" "$out" - '' + stdenv.lib.optionalString stdenv.isDarwin '' - # Fixed in https://github.com/google/re2/commit/b2c9765b4a7afbea8b6be1dae548b6f4d5f39e42 - substituteInPlace Makefile \ - --replace '-dynamiclib' '-dynamiclib -Wl,-install_name,$(libdir)/libre2.so.$(SONAME)' + # we're using gnu sed, even on darwin + substituteInPlace Makefile --replace "SED_INPLACE=sed -i '''" "SED_INPLACE=sed -i" ''; meta = { - homepage = https://code.google.com/p/re2/; + homepage = https://github.com/google/re2; description = "An efficient, principled regular expression library"; license = stdenv.lib.licenses.bsd3; platforms = with stdenv.lib.platforms; all;