From 57fb7a95c4e051812caee956f33671db697e49e1 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Wed, 26 Feb 2025 16:10:05 -0300 Subject: [PATCH 1/3] cosmic-design-demo: refactor --- .../by-name/co/cosmic-design-demo/package.nix | 33 ++++++------------- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/pkgs/by-name/co/cosmic-design-demo/package.nix b/pkgs/by-name/co/cosmic-design-demo/package.nix index 2f003b482f2f..30dae73af357 100644 --- a/pkgs/by-name/co/cosmic-design-demo/package.nix +++ b/pkgs/by-name/co/cosmic-design-demo/package.nix @@ -3,25 +3,20 @@ stdenv, fetchFromGitHub, rustPlatform, - cmake, just, - pkg-config, + libcosmicAppHook, expat, - libxkbcommon, fontconfig, freetype, - wayland, - makeBinaryWrapper, - cosmic-icons, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "cosmic-design-demo"; version = "unstable-2024-01-08"; src = fetchFromGitHub { owner = "pop-os"; - repo = pname; + repo = "cosmic-design-demo"; rev = "d58cfad46f2982982494fce27fb00ad834dc8992"; hash = "sha256-nWkiaegSjxgyGlpjXE9vzGjiDORaRCSoZJMDv0jtvaA="; }; @@ -30,20 +25,18 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-czfDtiSEmzmcLfpqv0/8sP8zDAEKh+pkQkGXdd5NskM="; nativeBuildInputs = [ - cmake just - pkg-config - makeBinaryWrapper + libcosmicAppHook ]; + buildInputs = [ - libxkbcommon expat fontconfig freetype - wayland ]; dontUseJustBuild = true; + dontUseJustCheck = true; justFlags = [ "--unstable" @@ -55,18 +48,12 @@ rustPlatform.buildRustPackage rec { "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-design-demo" ]; - postInstall = '' - wrapProgram "$out/bin/cosmic-design-demo" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ wayland ]}" \ - --suffix XDG_DATA_DIRS : "${cosmic-icons}/share" - ''; - - meta = with lib; { + meta = { homepage = "https://github.com/pop-os/cosmic-design-demo"; description = "Design Demo for the COSMIC Desktop Environment"; - license = licenses.mpl20; - maintainers = with maintainers; [ nyabinary ]; - platforms = platforms.linux; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ nyabinary ]; + platforms = lib.platforms.linux; mainProgram = "cosmic-design-demo"; }; } From 47fcada1f3818011ebaa032590866a654c761834 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Wed, 26 Feb 2025 16:10:57 -0300 Subject: [PATCH 2/3] cosmic-design-demo: prefix `0-` in unstable version --- pkgs/by-name/co/cosmic-design-demo/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/co/cosmic-design-demo/package.nix b/pkgs/by-name/co/cosmic-design-demo/package.nix index 30dae73af357..0cd7c569b7f1 100644 --- a/pkgs/by-name/co/cosmic-design-demo/package.nix +++ b/pkgs/by-name/co/cosmic-design-demo/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage { pname = "cosmic-design-demo"; - version = "unstable-2024-01-08"; + version = "0-unstable-2024-01-08"; src = fetchFromGitHub { owner = "pop-os"; From f1580b384408f4c4029390b0d97d1dde7ec0b888 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Wed, 26 Feb 2025 16:12:44 -0300 Subject: [PATCH 3/3] cosmic-design-demo: add HeitorAugustoLN as a maintainer --- pkgs/by-name/co/cosmic-design-demo/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/co/cosmic-design-demo/package.nix b/pkgs/by-name/co/cosmic-design-demo/package.nix index 0cd7c569b7f1..5a4f4fc1c81e 100644 --- a/pkgs/by-name/co/cosmic-design-demo/package.nix +++ b/pkgs/by-name/co/cosmic-design-demo/package.nix @@ -52,7 +52,10 @@ rustPlatform.buildRustPackage { homepage = "https://github.com/pop-os/cosmic-design-demo"; description = "Design Demo for the COSMIC Desktop Environment"; license = lib.licenses.mpl20; - maintainers = with lib.maintainers; [ nyabinary ]; + maintainers = with lib.maintainers; [ + nyabinary + HeitorAugustoLN + ]; platforms = lib.platforms.linux; mainProgram = "cosmic-design-demo"; };