Skip to content

Commit 8a28ffc

Browse files
authored
calaos_installer: modernize, move to by-name (#399863)
2 parents 3d16878 + c6f88a9 commit 8a28ffc

File tree

2 files changed

+14
-17
lines changed

2 files changed

+14
-17
lines changed
Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,29 @@
11
{
2-
mkDerivation,
32
lib,
43
stdenv,
54
fetchFromGitHub,
6-
qmake,
7-
qttools,
8-
qtbase,
5+
libsForQt5,
96
}:
107

11-
mkDerivation rec {
8+
stdenv.mkDerivation (finalAttrs: {
129
pname = "calaos_installer";
1310
version = "3.11";
1411

1512
src = fetchFromGitHub {
1613
owner = "calaos";
1714
repo = "calaos_installer";
18-
rev = "v${version}";
19-
sha256 = "sha256-e/f58VtGmKukdv4rIrGljXhA9d/xUycM5V6I1FT5qeY=";
15+
tag = "v${finalAttrs.version}";
16+
hash = "sha256-e/f58VtGmKukdv4rIrGljXhA9d/xUycM5V6I1FT5qeY=";
2017
};
2118

22-
nativeBuildInputs = [
19+
buildInputs = [ libsForQt5.qtbase ];
20+
nativeBuildInputs = with libsForQt5; [
2321
qmake
22+
wrapQtAppsHook
2423
qttools
2524
];
26-
buildInputs = [ qtbase ];
2725

28-
qmakeFlags = [ "REVISION=${version}" ];
26+
qmakeFlags = [ "REVISION=${finalAttrs.version}" ];
2927

3028
installPhase =
3129
if stdenv.hostPlatform.isDarwin then
@@ -39,12 +37,13 @@ mkDerivation rec {
3937
cp -a calaos_installer $out/bin
4038
'';
4139

42-
meta = with lib; {
40+
meta = {
4341
description = "Calaos Installer, a tool to create calaos configuration";
4442
mainProgram = "calaos_installer";
4543
homepage = "https://www.calaos.fr/";
46-
license = licenses.gpl3Plus;
47-
platforms = platforms.all;
48-
maintainers = with maintainers; [ tiramiseb ];
44+
downloadPage = "https://github.com/calaos/calaos_installer/";
45+
license = lib.licenses.gpl3Plus;
46+
platforms = lib.platforms.all;
47+
maintainers = with lib.maintainers; [ tiramiseb ];
4948
};
50-
}
49+
})

pkgs/top-level/all-packages.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18315,8 +18315,6 @@ with pkgs;
1831518315

1831618316
brgenml1lpr = pkgsi686Linux.callPackage ../misc/cups/drivers/brgenml1lpr { };
1831718317

18318-
calaos_installer = libsForQt5.callPackage ../misc/calaos/installer { };
18319-
1832018318
clinfo = callPackage ../tools/system/clinfo {
1832118319
inherit (darwin.apple_sdk.frameworks) OpenCL;
1832218320
};

0 commit comments

Comments
 (0)