From 767cfab0859b8583c6ed72a8ca8e170a2b714686 Mon Sep 17 00:00:00 2001 From: azahi Date: Thu, 3 Apr 2025 01:39:17 +0300 Subject: [PATCH] zint: move to by-name --- .../default.nix => by-name/zi/zint/package.nix} | 13 +++++-------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 5 insertions(+), 10 deletions(-) rename pkgs/{development/libraries/zint/default.nix => by-name/zi/zint/package.nix} (95%) diff --git a/pkgs/development/libraries/zint/default.nix b/pkgs/by-name/zi/zint/package.nix similarity index 95% rename from pkgs/development/libraries/zint/default.nix rename to pkgs/by-name/zi/zint/package.nix index 2b5e89f38c33..f38c6277bf56 100644 --- a/pkgs/development/libraries/zint/default.nix +++ b/pkgs/by-name/zi/zint/package.nix @@ -5,11 +5,8 @@ cmake, ninja, libpng, - qtbase, - qtsvg, - qttools, + qt6, versionCheckHook, - wrapQtAppsHook, zlib, }: stdenv.mkDerivation (finalAttrs: { @@ -41,13 +38,13 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ninja - wrapQtAppsHook + qt6.wrapQtAppsHook ]; buildInputs = [ - qtbase - qtsvg - qttools + qt6.qtbase + qt6.qtsvg + qt6.qttools ]; propagatedBuildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 01cee5c744ab..e85c168d4f72 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5765,8 +5765,6 @@ with pkgs; zpaq = callPackage ../tools/archivers/zpaq { }; zpaqd = callPackage ../tools/archivers/zpaq/zpaqd.nix { }; - zint = qt6Packages.callPackage ../development/libraries/zint { }; - zstd = callPackage ../tools/compression/zstd { cmake = buildPackages.cmakeMinimal; };