Skip to content

Commit

Permalink
snappy: 1.1.4 -> 1.1.7
Browse files Browse the repository at this point in the history
Fixes build on ARM
  • Loading branch information
dezgeg committed Nov 26, 2017
1 parent f83bb7d commit f689a6d
Showing 1 changed file with 12 additions and 8 deletions.
20 changes: 12 additions & 8 deletions 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/;
Expand Down

4 comments on commit f689a6d

@orivej
Copy link
Contributor

@orivej orivej commented on f689a6d Dec 1, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This broke the build of wiredtiger.

@orivej
Copy link
Contributor

@orivej orivej commented on f689a6d Dec 1, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have marked it as broken in eb32f08.

@orivej
Copy link
Contributor

@orivej orivej commented on f689a6d Dec 20, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@orivej
Copy link
Contributor

@orivej orivej commented on f689a6d Dec 20, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in febcb66 (#32880).

Please sign in to comment.