nomacs: switch to Qt6 only

K900 bc779518 1c69df60

+12 -19
+11 -17
pkgs/by-name/no/nomacs/package.nix
··· 4 4 exiv2, 5 5 fetchFromGitHub, 6 6 libraw, 7 - libsForQt5, 8 7 kdePackages, 8 + qt6, 9 9 libtiff, 10 10 opencv4, 11 11 pkg-config, 12 12 stdenv, 13 - qtVersion ? 5, 14 13 }: 15 - let 16 - myQt = if qtVersion == 5 then libsForQt5 else kdePackages; 17 - inherit (myQt) wrapQtAppsHook; 18 - in 19 14 stdenv.mkDerivation (finalAttrs: { 20 15 pname = "nomacs"; 21 16 version = "3.21.1"; ··· 53 48 54 49 nativeBuildInputs = [ 55 50 cmake 56 - wrapQtAppsHook 51 + qt6.wrapQtAppsHook 57 52 pkg-config 58 53 ]; 59 54 ··· 65 60 # note `dev` is selected by `mkDerivation` automatically, so one should omit `getOutput "dev"`; 66 61 # see: https://github.com/NixOS/nixpkgs/pull/314186#issuecomment-2129974277 67 62 (lib.getOutput "cxxdev" opencv4) 68 - ] 69 - ++ (with myQt; [ 70 - kimageformats 71 - qtbase 72 - qtimageformats 73 - qtsvg 74 - qttools 75 - quazip 76 - ]); 63 + 64 + kdePackages.kimageformats 65 + qt6.qtbase 66 + qt6.qtimageformats 67 + qt6.qtsvg 68 + qt6.qttools 69 + kdePackages.quazip 70 + ]; 77 71 78 72 cmakeFlags = [ 79 73 (lib.cmakeBool "ENABLE_OPENCV" true) ··· 123 117 mindavi 124 118 ppenguin 125 119 ]; 126 - inherit (myQt.qtbase.meta) platforms; 120 + inherit (qt6.qtbase.meta) platforms; 127 121 }; 128 122 })
+1
pkgs/top-level/aliases.nix
··· 1725 1725 corepack_18 = nodejs_18; # Added 2025-04-23 1726 1726 nodejs-18_x = nodejs_18; # Added 2022-11-06 1727 1727 nodejs-slim-18_x = nodejs-slim_18; # Added 2022-11-06 1728 + nomacs-qt6 = nomacs; # Added 2025-08-30 1728 1729 nomad_1_4 = throw "nomad_1_4 is no longer supported upstream. You can switch to using a newer version of the nomad package, or revert to older nixpkgs if you cannot upgrade"; # Added 2025-02-02 1729 1730 nomad_1_5 = throw "nomad_1_5 is no longer supported upstream. You can switch to using a newer version of the nomad package, or revert to older nixpkgs if you cannot upgrade"; # Added 2025-02-02 1730 1731 nomad_1_6 = throw "nomad_1_6 is no longer supported upstream. You can switch to using a newer version of the nomad package, or revert to older nixpkgs if you cannot upgrade"; # Added 2025-02-02
-2
pkgs/top-level/all-packages.nix
··· 3700 3700 nomad_1_10 3701 3701 ; 3702 3702 3703 - nomacs-qt6 = nomacs.override { qtVersion = 6; }; 3704 - 3705 3703 nth = with python3Packages; toPythonApplication name-that-hash; 3706 3704 3707 3705 nvchecker =