diff --git a/pkgs/by-name/co/cosmic-panel/package.nix b/pkgs/by-name/co/cosmic-panel/package.nix index 951c3ef3869f..279addbd48b7 100644 --- a/pkgs/by-name/co/cosmic-panel/package.nix +++ b/pkgs/by-name/co/cosmic-panel/package.nix @@ -1,24 +1,22 @@ { lib, stdenv, - fetchFromGitHub, - just, - pkg-config, rustPlatform, - libglvnd, - libxkbcommon, - wayland, + fetchFromGitHub, + libcosmicAppHook, + just, + nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-panel"; - version = "1.0.0-alpha.5.1"; + version = "1.0.0-alpha.6"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-panel"; - tag = "epoch-${version}"; - hash = "sha256-nO7Y1SpwvfHhL0OSy7Ti+e8NPzfknW2SGs7IYoF1Jow="; + tag = "epoch-${finalAttrs.version}"; + hash = "sha256-6lt9Rig1pM37B7+nRrR+eYke8umSfYlg8aLB45Q1X+4="; }; useFetchCargoVendor = true; @@ -26,15 +24,11 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ just - pkg-config - ]; - buildInputs = [ - libglvnd - libxkbcommon - wayland + libcosmicAppHook ]; dontUseJustBuild = true; + dontUseJustCheck = true; justFlags = [ "--set" @@ -45,24 +39,25 @@ rustPlatform.buildRustPackage rec { "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-panel" ]; - # Force linking to libEGL, which is always dlopen()ed. - "CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_RUSTFLAGS" = - map (a: "-C link-arg=${a}") - [ - "-Wl,--push-state,--no-as-needed" - "-lEGL" - "-Wl,--pop-state" - ]; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; - meta = with lib; { + meta = { homepage = "https://github.com/pop-os/cosmic-panel"; description = "Panel for the COSMIC Desktop Environment"; mainProgram = "cosmic-panel"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ qyliss nyabinary + HeitorAugustoLN ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; -} +})