Skip to content

Commit 0823e91

Browse files
cosmic-design-demo: refactor (#385355)
2 parents 3782684 + f1580b3 commit 0823e91

File tree

1 file changed

+14
-24
lines changed

1 file changed

+14
-24
lines changed

pkgs/by-name/co/cosmic-design-demo/package.nix

Lines changed: 14 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,20 @@
33
stdenv,
44
fetchFromGitHub,
55
rustPlatform,
6-
cmake,
76
just,
8-
pkg-config,
7+
libcosmicAppHook,
98
expat,
10-
libxkbcommon,
119
fontconfig,
1210
freetype,
13-
wayland,
14-
makeBinaryWrapper,
15-
cosmic-icons,
1611
}:
1712

18-
rustPlatform.buildRustPackage rec {
13+
rustPlatform.buildRustPackage {
1914
pname = "cosmic-design-demo";
20-
version = "unstable-2024-01-08";
15+
version = "0-unstable-2024-01-08";
2116

2217
src = fetchFromGitHub {
2318
owner = "pop-os";
24-
repo = pname;
19+
repo = "cosmic-design-demo";
2520
rev = "d58cfad46f2982982494fce27fb00ad834dc8992";
2621
hash = "sha256-nWkiaegSjxgyGlpjXE9vzGjiDORaRCSoZJMDv0jtvaA=";
2722
};
@@ -30,20 +25,18 @@ rustPlatform.buildRustPackage rec {
3025
cargoHash = "sha256-czfDtiSEmzmcLfpqv0/8sP8zDAEKh+pkQkGXdd5NskM=";
3126

3227
nativeBuildInputs = [
33-
cmake
3428
just
35-
pkg-config
36-
makeBinaryWrapper
29+
libcosmicAppHook
3730
];
31+
3832
buildInputs = [
39-
libxkbcommon
4033
expat
4134
fontconfig
4235
freetype
43-
wayland
4436
];
4537

4638
dontUseJustBuild = true;
39+
dontUseJustCheck = true;
4740

4841
justFlags = [
4942
"--unstable"
@@ -55,18 +48,15 @@ rustPlatform.buildRustPackage rec {
5548
"target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-design-demo"
5649
];
5750

58-
postInstall = ''
59-
wrapProgram "$out/bin/cosmic-design-demo" \
60-
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ wayland ]}" \
61-
--suffix XDG_DATA_DIRS : "${cosmic-icons}/share"
62-
'';
63-
64-
meta = with lib; {
51+
meta = {
6552
homepage = "https://github.com/pop-os/cosmic-design-demo";
6653
description = "Design Demo for the COSMIC Desktop Environment";
67-
license = licenses.mpl20;
68-
maintainers = with maintainers; [ nyabinary ];
69-
platforms = platforms.linux;
54+
license = lib.licenses.mpl20;
55+
maintainers = with lib.maintainers; [
56+
nyabinary
57+
HeitorAugustoLN
58+
];
59+
platforms = lib.platforms.linux;
7060
mainProgram = "cosmic-design-demo";
7161
};
7262
}

0 commit comments

Comments
 (0)