nomacs: switch to Qt6 only
This commit is contained in:
@@ -4,18 +4,13 @@
|
||||
exiv2,
|
||||
fetchFromGitHub,
|
||||
libraw,
|
||||
libsForQt5,
|
||||
kdePackages,
|
||||
qt6,
|
||||
libtiff,
|
||||
opencv4,
|
||||
pkg-config,
|
||||
stdenv,
|
||||
qtVersion ? 5,
|
||||
}:
|
||||
let
|
||||
myQt = if qtVersion == 5 then libsForQt5 else kdePackages;
|
||||
inherit (myQt) wrapQtAppsHook;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nomacs";
|
||||
version = "3.21.1";
|
||||
@@ -53,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
wrapQtAppsHook
|
||||
qt6.wrapQtAppsHook
|
||||
pkg-config
|
||||
];
|
||||
|
||||
@@ -65,15 +60,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# note `dev` is selected by `mkDerivation` automatically, so one should omit `getOutput "dev"`;
|
||||
# see: https://github.com/NixOS/nixpkgs/pull/314186#issuecomment-2129974277
|
||||
(lib.getOutput "cxxdev" opencv4)
|
||||
]
|
||||
++ (with myQt; [
|
||||
kimageformats
|
||||
qtbase
|
||||
qtimageformats
|
||||
qtsvg
|
||||
qttools
|
||||
quazip
|
||||
]);
|
||||
|
||||
kdePackages.kimageformats
|
||||
qt6.qtbase
|
||||
qt6.qtimageformats
|
||||
qt6.qtsvg
|
||||
qt6.qttools
|
||||
kdePackages.quazip
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "ENABLE_OPENCV" true)
|
||||
@@ -123,6 +117,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mindavi
|
||||
ppenguin
|
||||
];
|
||||
inherit (myQt.qtbase.meta) platforms;
|
||||
inherit (qt6.qtbase.meta) platforms;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -1725,6 +1725,7 @@ mapAliases {
|
||||
corepack_18 = nodejs_18; # Added 2025-04-23
|
||||
nodejs-18_x = nodejs_18; # Added 2022-11-06
|
||||
nodejs-slim-18_x = nodejs-slim_18; # Added 2022-11-06
|
||||
nomacs-qt6 = nomacs; # Added 2025-08-30
|
||||
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
|
||||
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
|
||||
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
|
||||
|
||||
@@ -3700,8 +3700,6 @@ with pkgs;
|
||||
nomad_1_10
|
||||
;
|
||||
|
||||
nomacs-qt6 = nomacs.override { qtVersion = 6; };
|
||||
|
||||
nth = with python3Packages; toPythonApplication name-that-hash;
|
||||
|
||||
nvchecker =
|
||||
|
||||
Reference in New Issue
Block a user