From dd87598615ae6e5ff9c3c97594853b54cb62ac9f Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 13 Sep 2014 19:13:43 -0700 Subject: [PATCH] snappy: 1.1.1 -> 1.1.2 --- pkgs/development/libraries/snappy/default.nix | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix index acba85ec43b9..90469508d0e5 100644 --- a/pkgs/development/libraries/snappy/default.nix +++ b/pkgs/development/libraries/snappy/default.nix @@ -1,23 +1,31 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook }: stdenv.mkDerivation rec { - name = "snappy-1.1.1"; + name = "snappy-1.1.2"; - src = fetchurl { - url = "http://snappy.googlecode.com/files/${name}.tar.gz"; - sha256 = "1czscb5i003jg1amw3g1fmasv8crr5g3d922800kll8b3fj097yp"; + src = fetchFromGitHub { + owner = "google"; + repo = "snappy"; + rev = "1ff9be9b8fafc8528ca9e055646f5932aa5db9c4"; + sha256 = "1zyjj13max0z42g3ii54n3qn7rbcga34dbi26lpm7v5ya752shx7"; }; - # -DNDEBUG for speed + buildInputs = [ pkgconfig autoreconfHook ]; + preConfigure = '' - configureFlagsArray=("CXXFLAGS=-DNDEBUG -O2") + sh autogen.sh ''; + # -DNDEBUG for speed + configureFlags = [ "CXXFLAGS=-DNDEBUG" ]; + doCheck = true; - meta = { + meta = with stdenv.lib; { homepage = http://code.google.com/p/snappy/; - license = "BSD"; + license = licenses.bsd3; description = "Compression/decompression library for very high speeds"; + platforms = platforms.unix; + maintainers = with maintainers; [ wkennington ]; }; }