diff --git a/pkgs/misc/calaos/installer/default.nix b/pkgs/misc/calaos/installer/default.nix index 311b87f6b429..1af9b86e5178 100644 --- a/pkgs/misc/calaos/installer/default.nix +++ b/pkgs/misc/calaos/installer/default.nix @@ -1,31 +1,29 @@ { - mkDerivation, lib, stdenv, fetchFromGitHub, - qmake, - qttools, - qtbase, + libsForQt5, }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "calaos_installer"; version = "3.11"; src = fetchFromGitHub { owner = "calaos"; repo = "calaos_installer"; - rev = "v${version}"; - sha256 = "sha256-e/f58VtGmKukdv4rIrGljXhA9d/xUycM5V6I1FT5qeY="; + tag = "v${finalAttrs.version}"; + hash = "sha256-e/f58VtGmKukdv4rIrGljXhA9d/xUycM5V6I1FT5qeY="; }; - nativeBuildInputs = [ + buildInputs = [ libsForQt5.qtbase ]; + nativeBuildInputs = with libsForQt5; [ qmake + wrapQtAppsHook qttools ]; - buildInputs = [ qtbase ]; - qmakeFlags = [ "REVISION=${version}" ]; + qmakeFlags = [ "REVISION=${finalAttrs.version}" ]; installPhase = if stdenv.hostPlatform.isDarwin then @@ -39,12 +37,13 @@ mkDerivation rec { cp -a calaos_installer $out/bin ''; - meta = with lib; { + meta = { description = "Calaos Installer, a tool to create calaos configuration"; mainProgram = "calaos_installer"; homepage = "https://www.calaos.fr/"; - license = licenses.gpl3Plus; - platforms = platforms.all; - maintainers = with maintainers; [ tiramiseb ]; + downloadPage = "https://github.com/calaos/calaos_installer/"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ tiramiseb ]; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e79fba3425e..26401dd6cc34 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18330,7 +18330,7 @@ with pkgs; brgenml1lpr = pkgsi686Linux.callPackage ../misc/cups/drivers/brgenml1lpr { }; - calaos_installer = libsForQt5.callPackage ../misc/calaos/installer { }; + calaos_installer = callPackage ../misc/calaos/installer { }; clinfo = callPackage ../tools/system/clinfo { inherit (darwin.apple_sdk.frameworks) OpenCL;