summary refs log tree commit diff
path: root/pkgs/development/libraries/skalibs/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development/libraries/skalibs/default.nix')
-rw-r--r--pkgs/development/libraries/skalibs/default.nix22
1 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix
index 55c69b137e52..3fe8e275ea9c 100644
--- a/pkgs/development/libraries/skalibs/default.nix
+++ b/pkgs/development/libraries/skalibs/default.nix
@@ -1,11 +1,11 @@
 { stdenv
-, skarnetConfCompile
 , fetchurl
+, gnumake40
 }:
 
 let
 
-  version = "1.6.0.0";
+  version = "2.0.0.0";
 
 in stdenv.mkDerivation rec {
 
@@ -13,19 +13,19 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://skarnet.org/software/skalibs/${name}.tar.gz";
-    sha256 = "0jz3farll9n5jvz3g6wri99s6njkgmnf0r9jqjlg03f20dzv8c8w";
+    sha256 = "0cz30wqg8fnkwjlacs4s3sjs3l34sa91xgci95fmb187zhiq693n";
   };
 
-  sourceRoot = "prog/${name}";
+  dontDisableStatic = true;
 
-  # See http://skarnet.org/cgi-bin/archive.cgi?1:mss:75:201405:pkmodhckjklemogbplje
-  patches = [ ./getpeereid.patch ];
+  buildInputs = [ gnumake40 ];
 
-  buildInputs = [ skarnetConfCompile ];
-
-  preInstall = ''
-    mkdir -p "$out/etc"
-  '';
+  configureFlags = [
+    "--enable-force-devr"       # assume /dev/random works
+    "--libdir=\${prefix}/lib"
+    "--includedir=\${prefix}/include"
+    "--sysdepdir=\${prefix}/lib/skalibs/sysdeps"
+  ] ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]);
 
   meta = {
     homepage = http://skarnet.org/software/skalibs/;