summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2018-02-05 08:43:27 -0600
committerWill Dietz <w@wdtz.org>2018-02-05 08:55:05 -0600
commit088274bf2c22dc97a518a9322be57a20da6b0f2b (patch)
tree039b9b0cac9f4e595fa63383e52ecc9fdf5270b2 /pkgs/tools
parentf565274fe530d2c3008ec6e2f27a1381a0978ce0 (diff)
downloadnixlib-088274bf2c22dc97a518a9322be57a20da6b0f2b.tar
nixlib-088274bf2c22dc97a518a9322be57a20da6b0f2b.tar.gz
nixlib-088274bf2c22dc97a518a9322be57a20da6b0f2b.tar.bz2
nixlib-088274bf2c22dc97a518a9322be57a20da6b0f2b.tar.lz
nixlib-088274bf2c22dc97a518a9322be57a20da6b0f2b.tar.xz
nixlib-088274bf2c22dc97a518a9322be57a20da6b0f2b.tar.zst
nixlib-088274bf2c22dc97a518a9322be57a20da6b0f2b.zip
rhash: 1.3.5 -> 2018-02-05
Latest git is much more build-friendly.
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/security/rhash/default.nix25
1 files changed, 12 insertions, 13 deletions
diff --git a/pkgs/tools/security/rhash/default.nix b/pkgs/tools/security/rhash/default.nix
index 14121b3bc04c..485b34cff88d 100644
--- a/pkgs/tools/security/rhash/default.nix
+++ b/pkgs/tools/security/rhash/default.nix
@@ -1,24 +1,23 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub, which }:
 
 stdenv.mkDerivation rec {
-  version = "1.3.5";
+  version = "2018-02-05";
   name = "rhash-${version}";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/rhash/${name}-src.tar.gz";
-    sha256 = "0bhz3xdl6r06k1bqigdjz42l31iqz2qdpg7zk316i7p2ra56iq4q";
+  src = fetchFromGitHub {
+    owner = "rhash";
+    repo = "RHash";
+    rev = "cc26d54ff5df0f692907a5e3132a5eeca559ed61";
+    sha256 = "1ldagp931lmxxpyvsb9rrar4iqwmv94m6lfjzkbkshpmk3p5ng7h";
   };
 
-  patches = stdenv.lib.optional stdenv.isDarwin ./darwin.patch;
+  nativeBuildInputs = [ which ];
 
-  makeFlags = [ "DESTDIR=$(out)" "PREFIX=/" "AR:=$(AR)" "CC:=$(CC)" ];
+  # configure script is not autotools-based, doesn't support these options
+  configurePlatforms = [ ];
 
-  buildFlags = [ "build-shared" "lib-shared" ];
-
-  installPhase = ''
-    make $makeFlags -C librhash install-lib-shared install-headers install-so-link
-    make $makeFlags install-shared
-  '';
+  installTargets = [ "install" "install-lib-shared" "install-lib-so-link" ];
+  postInstall = "make -C librhash install-headers";
 
   meta = with stdenv.lib; {
     homepage = http://rhash.anz.ru;