tikzit: move to pkgs/by-name

this shouldn't create any rebuilds
2026-02-01 23:03:41 +01:00
parent 58d8efa6e3
commit 7df68118d1
2 changed files with 7 additions and 12 deletions
@@ -2,13 +2,10 @@
  lib,
  stdenv,
  fetchFromGitHub,
-  qmake,
-  qttools,
-  qtbase,
-  poppler,
+  qt5,
  flex,
  bison,
-  wrapQtAppsHook,
+  libsForQt5,
 }:

 stdenv.mkDerivation {
@@ -23,15 +20,15 @@ stdenv.mkDerivation {
  };

  nativeBuildInputs = [
-    qmake
-    qttools
+    qt5.qmake
+    qt5.qttools
    flex
    bison
-    wrapQtAppsHook
+    qt5.wrapQtAppsHook
  ];
  buildInputs = [
-    qtbase
-    poppler
+    qt5.qtbase
+    libsForQt5.poppler
  ];

  # src/data/tikzlexer.l:29:10: fatal error: tikzparser.parser.hpp: No such file or directory
@@ -3583,8 +3583,6 @@ with pkgs;

  tinc = callPackage ../tools/networking/tinc { };

-  tikzit = libsForQt5.callPackage ../tools/typesetting/tikzit { };
-
  tinc_pre = callPackage ../tools/networking/tinc/pre.nix { };

  tldr-hs = haskellPackages.tldr;