rhash: 1.3.3 -> 1.3.5

1.3.5: https://github.com/rhash/RHash/releases/tag/v1.3.5
1.3.4: https://github.com/rhash/RHash/releases/tag/v1.3.4

* still need makefile bug workarounds
* cleanup a bit
* port darwin patch--
  don't believe still needed but shouldn't hurt.

pkgs/tools/security/rhash/default.nix

@@ -1,31 +1,23 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "1.3.3";
+  version = "1.3.5";
   name = "rhash-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/rhash/${name}-src.tar.gz";
-    sha1 = "0981bdc98ba7ef923b1a6cd7fd8bb0374cff632e";
-    sha256 = "0nii6p4m2x8rkaf8r6smgfwb1q4hpf117kkg64yr6gyqgdchnljv";
+    sha256 = "0bhz3xdl6r06k1bqigdjz42l31iqz2qdpg7zk316i7p2ra56iq4q";
   };
 
   patches = stdenv.lib.optional stdenv.isDarwin ./darwin.patch;
 
-  installFlags = [ "DESTDIR=$(out)" "PREFIX=/" ];
+  makeFlags = [ "DESTDIR=$(out)" "PREFIX=/" "AR:=$(AR)" "CC:=$(CC)" ];
 
-  # we build the static library because of two makefile bugs
-  # * .h files installed for static library target only
-  # * .so.0 -> .so link only created in the static library install target
-  buildPhase = ''
-    make lib-shared lib-static build-shared CC=$CC AR=$AR PREFIX=$out
-  '';
+  buildFlags = [ "build-shared" "lib-shared" ];
 
-  # we don't actually want the static library, so we remove it after it
-  # gets installed
   installPhase = ''
-    make DESTDIR="$out" PREFIX="/" install-shared install-lib-shared install-lib-static
-    rm $out/lib/librhash.a
+    make $makeFlags -C librhash install-lib-shared install-headers install-so-link
+    make $makeFlags install-shared
   '';
 
   meta = with stdenv.lib; {