nur-packages

commit 5e2fddcc81dfe217c74f3a8ccbed0b1c9d65510a
parent be82f6c0976cc1e288ba0bc26c2ccd11067558e7
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date:   Fri,  7 May 2021 20:26:21 +0300

Fix klogg

Diffstat:
M
nix/sources.json
 | 
14
--------------
M
pkgs/applications/misc/klogg/default.nix
 | 
30
+++++++++++++++++++++++-------
M
pkgs/default.nix
 | 
4
+---

3 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/nix/sources.json b/nix/sources.json
@@ -37,20 +37,6 @@
         "url": "https://github.com/BourgeoisLab/GPXLab/archive/0a2e13756ed1c39f4278b0b3d6cef7f8ac9f6fe7.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
-    "klogg": {
-        "branch": "master",
-        "builtin": false,
-        "date": "2021-02-25T10:09:37Z",
-        "description": "A fast, advanced log explorer based on glogg project",
-        "homepage": "https://klogg.filimonov.dev/",
-        "owner": "variar",
-        "repo": "klogg",
-        "rev": "9bf68ff2c6f2290723cb2c0ca3b834a6a6290291",
-        "sha256": "0fnhwhdxzpaf8cqfgr7m2zmj26bpls9dh5r9yxijbbpmnwqmghdp",
-        "type": "tarball",
-        "url": "https://github.com/variar/klogg/archive/9bf68ff2c6f2290723cb2c0ca3b834a6a6290291.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-    },
     "map-hr": {
         "branch": "master",
         "builtin": false,
diff --git a/pkgs/applications/misc/klogg/default.nix b/pkgs/applications/misc/klogg/default.nix
@@ -1,19 +1,30 @@
 { stdenv
 , lib
 , mkDerivation
+, fetchFromGitHub
 , cmake
 , ninja
-, sources
+, python3Packages
+, boost
+, ragel
 , useSentry ? stdenv.isLinux
+, useHyperscan ? false
 }:
 
 mkDerivation rec {
-  pname = "klogg-unstable";
-  version = lib.substring 0 10 sources.klogg.date;
+  pname = "klogg";
+  version = "2021-05-06";
+
+  src = fetchFromGitHub {
+    owner = "variar";
+    repo = pname;
+    rev = "50fcd2f9e3d4947b131f94aaa4bc4807b7e41c30";
+    hash = "sha256-8rA15uekxeN8PYlFGy3mixAk4uzln5YcWFqs+zpueAo=";
+  };
 
-  src = sources.klogg;
+  nativeBuildInputs = [ cmake ninja python3Packages.python ];
 
-  nativeBuildInputs = [ cmake ninja ];
+  buildInputs = [ boost ragel ];
 
   postPatch = lib.optionalString useSentry ''
     patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
@@ -28,12 +39,17 @@ mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=missing-braces";
 
-  cmakeFlags = lib.optional (!useSentry) "-DKLOGG_USE_SENTRY:BOOL=OFF";
+  cmakeFlags = lib.mapAttrsToList (k: v: "-D${k}=${if v then "ON" else "OFF"}") {
+    KLOGG_USE_SENTRY = useSentry;
+    KLOGG_USE_HYPERSCAN = useHyperscan;
+  };
 
   meta = with lib; {
-    inherit (sources.klogg) description homepage;
+    description = "A fast, advanced log explorer based on glogg project";
+    homepage = "https://klogg.filimonov.dev/";
     license = licenses.gpl3Plus;
     maintainers = [ maintainers.sikmir ];
     platforms = platforms.unix;
+    broken = stdenv.isDarwin;
   };
 }
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -15,9 +15,7 @@ lib.makeScope newScope (
     gpxsee-bin = callPackage ./applications/gpxsee/bin.nix { };
     i18n-editor-bin = callPackage ./applications/i18n-editor { jre = pkgs.jdk11; };
     iterm2-bin = callPackage ./applications/iterm2/bin.nix { };
-    klogg = libsForQt5.callPackage ./applications/misc/klogg {
-      inherit sources;
-    };
+    klogg = libsForQt5.callPackage ./applications/misc/klogg { };
     klogg-bin = callPackage ./applications/misc/klogg/bin.nix { };
     librewolf = callPackage ./applications/networking/librewolf { };
     macpass-bin = callPackage ./applications/macpass/bin.nix { };