From a6934b2389f9e2bb55675fc93498d949adb3bb40 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 8 Sep 2018 16:08:37 +0200 Subject: [PATCH] sks: Adapt the package to NixOS (pkgs.db provides only "db_stat") --- pkgs/servers/sks/adapt-to-nixos.patch | 27 +++++++++++++++++++++++++++ pkgs/servers/sks/default.nix | 3 +++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/servers/sks/adapt-to-nixos.patch diff --git a/pkgs/servers/sks/adapt-to-nixos.patch b/pkgs/servers/sks/adapt-to-nixos.patch new file mode 100644 index 00000000000..b4403e8c7bc --- /dev/null +++ b/pkgs/servers/sks/adapt-to-nixos.patch @@ -0,0 +1,27 @@ +--- a/version.ml 2018-09-08 15:56:18.919154257 +0200 ++++ b/version.ml 2018-09-08 15:56:07.544028575 +0200 +@@ -24,16 +24,6 @@ + + let run () = + let bdb_version = Bdb.version () in +- let dbstats_dir = +- let split = Str.regexp_string "." in +- let major_minor_string major minor = +- sprintf "Further details about the BDB environment can be seen by \ +- executing\ndb%s.%s_stat -x in the KDB and Ptree directories\n" major minor +- in +- match Str.split split bdb_version with +- | major :: minor :: _ -> major_minor_string major minor +- | [] | _ :: [] -> major_minor_string "X" "Y" +- in + printf "SKS version %s%s\n" + Common.version Common.version_suffix; + +@@ -44,5 +34,6 @@ + requirement for recon of SKS %s\n" + Common.compatible_version_string; + +- printf "%s" dbstats_dir ++ printf "Further details about the BDB environment can be seen by executing\n\ ++ db_stat -x in the KDB and PTree directories\n" + diff --git a/pkgs/servers/sks/default.nix b/pkgs/servers/sks/default.nix index e4f5ea1f57c..deeeabda745 100644 --- a/pkgs/servers/sks/default.nix +++ b/pkgs/servers/sks/default.nix @@ -11,6 +11,9 @@ stdenv.mkDerivation rec { sha256 = "00q5ma5rvl10rkc6cdw8d69bddgrmvy0ckqj3hbisy65l4idj2zm"; }; + # pkgs.db provides db_stat, not db$major.$minor_stat + patches = [ ./adapt-to-nixos.patch ]; + outputs = [ "out" "webSamples" ]; buildInputs = [ ocaml zlib db perl camlp4 ];