diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2017-11-24 15:20:52 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2017-11-26 11:13:20 +0200 |
| commit | f689a6d1c6796c4a4f116ffec6c4624379e04bc9 (patch) | |
| tree | 635c7ee94a0cd6fea425319d088c83ec52ac6dcb /pkgs/development/libraries | |
| parent | f83bb7d1eafd6ee0aa0d42c360c1a9026366e264 (diff) | |
| download | nixpkgs-f689a6d1c6796c4a4f116ffec6c4624379e04bc9.tar nixpkgs-f689a6d1c6796c4a4f116ffec6c4624379e04bc9.tar.gz nixpkgs-f689a6d1c6796c4a4f116ffec6c4624379e04bc9.tar.bz2 nixpkgs-f689a6d1c6796c4a4f116ffec6c4624379e04bc9.tar.lz nixpkgs-f689a6d1c6796c4a4f116ffec6c4624379e04bc9.tar.xz nixpkgs-f689a6d1c6796c4a4f116ffec6c4624379e04bc9.tar.zst nixpkgs-f689a6d1c6796c4a4f116ffec6c4624379e04bc9.zip | |
snappy: 1.1.4 -> 1.1.7
Fixes build on ARM
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/snappy/default.nix | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix index c5e52124cee..5ce636e6f0c 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/; |