sqlite3_analyzer: 3.8.10.1 -> 3.17.0

fixes #23479
NixOS · Mar 6, 2017 · eba71df · eba71df
1 parent b10fb46
commit eba71df
Showing 1 changed file with 11 additions and 19 deletions.
diff --git a/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix b/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix
@@ -1,35 +1,27 @@
 { lib, stdenv, fetchurl, unzip, tcl }:
 
 stdenv.mkDerivation {
-  name = "sqlite3_analyzer-3.8.10.1";
+  name = "sqlite3_analyzer-3.17.0";
 
   src = fetchurl {
-    url = "https://www.sqlite.org/2015/sqlite-src-3081001.zip";
-    sha1 = "6z7w8y69jxr0xwxbhs8z3zf56zfs5x7z";
+    url = "https://www.sqlite.org/2017/sqlite-src-3170000.zip";
+    sha256 = "1hs8nzk2pjr4fhhrwcyqwpa24gd4ndp6f0japykg5wfadgp4nxc6";
   };
 
-  buildInputs = [ unzip tcl ];
+  nativeBuildInputs = [ unzip ];
+  buildInputs = [ tcl ];
 
-  # A bug in the latest release of sqlite3 prevents bulding sqlite3_analyzer.
-  # Hopefully this work-around can be removed for future releases.
-  postConfigure = ''
-    substituteInPlace Makefile \
-      --replace '"#define SQLITE_ENABLE_DBSTAT_VTAB"' '"#define SQLITE_ENABLE_DBSTAT_VTAB 1"'
-  '';
-
-  buildPhase = ''
-    make sqlite3_analyzer
-  '';
+  makeFlags = [ "sqlite3_analyzer" ];
 
   installPhase = ''
-    mkdir -p "$out/bin"
-    mv sqlite3_analyzer "$out/bin"
+    install -Dm755 sqlite3_analyzer \
+      "$out/bin/sqlite3_analyzer"
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.sqlite.org/;
     description = "A tool that shows statistics about sqlite databases";
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ pesterhazy ];
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ pesterhazy ];
   };
 }