From f689a6d1c6796c4a4f116ffec6c4624379e04bc9 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Fri, 24 Nov 2017 15:20:52 +0200
Subject: snappy: 1.1.4 -> 1.1.7

Fixes build on ARM
---
 pkgs/development/libraries/snappy/default.nix | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'pkgs/development/libraries/snappy')

diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix
index c5e52124ceed0..5ce636e6f0cad 100644
--- a/pkgs/development/libraries/snappy/default.nix
+++ b/pkgs/development/libraries/snappy/default.nix
@@ -1,24 +1,28 @@
-{ stdenv, fetchurl, pkgconfig }:
+{ stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   name = "snappy-${version}";
-  version = "1.1.4";
+  version = "1.1.7";
 
-  src = fetchurl {
-    url = "http://github.com/google/snappy/releases/download/${version}/"
-        + "snappy-${version}.tar.gz";
-    sha256 = "0mq0nz8gbi1sp3y6xcg0a6wbvnd6gc717f3vh2xrjmfj5w9gwjqk";
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = "snappy";
+    rev = "${version}";
+    sha256 = "1x7r8sjmdqlqjz0xfiwdyrqpgaj5yrvrgb28ivgpvnxgar5qv6m2";
   };
 
-  outputs = [ "out" "dev" "doc" ];
+  outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ cmake ];
 
   # -DNDEBUG for speed
   configureFlags = [ "CXXFLAGS=-DNDEBUG" ];
 
   # SIGILL on darwin
   doCheck = !stdenv.isDarwin;
+  checkPhase = ''
+    (cd .. && ./build/snappy_unittest)
+  '';
 
   meta = with stdenv.lib; {
     homepage = https://google.github.io/snappy/;
-- 
cgit 1.4.1