From c28d1169ec0b02826dea8ae277bdddf586183fcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 11 Oct 2013 21:23:10 +0200 Subject: [PATCH] Fixing the libsodium expression to use the release tarball. --- .../libraries/libsodium/default.nix | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index 1514f1284245..e8124c2643ab 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -1,23 +1,14 @@ -{ stdenv, fetchurl, autoconf, libtool, automake }: +{ stdenv, fetchurl }: -let - version = "0.4.3"; -in stdenv.mkDerivation rec { - name = "libsodium-${version}"; + name = "libsodium-0.4.3"; src = fetchurl { - url = "https://github.com/jedisct1/libsodium/tarball/${version}"; - name = "${name}.tar.gz"; - sha256 = "0vammhvkz6masnwyacqkzkah05bgv3syb97jvg2y49vb67pwmspn"; + url = "https://download.libsodium.org/libsodium/releases/${name}.tar.gz"; + sha256 = "0hk0zca1kpj6xlc2j2qx9qy7287pi0896frmxq5d7qmcwsdf372r"; }; - preConfigure = '' - ACLOCAL_PATH=$ACLOCAL_PATH:`pwd`/m4 - ./autogen.sh - ''; - - buildInputs = [ autoconf libtool automake ]; + NIX_LDFLAGS = "-lssp"; doCheck = true;