diff --git a/pkgs/by-name/co/cosmic-launcher/package.nix b/pkgs/by-name/co/cosmic-launcher/package.nix index b3ded86538ac..3db03c2d7c51 100644 --- a/pkgs/by-name/co/cosmic-launcher/package.nix +++ b/pkgs/by-name/co/cosmic-launcher/package.nix @@ -4,43 +4,31 @@ fetchFromGitHub, rustPlatform, just, - pkg-config, - makeBinaryWrapper, - libxkbcommon, - wayland, - appstream-glib, - desktop-file-utils, - intltool, + libcosmicAppHook, + nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "cosmic-launcher"; - version = "1.0.0-alpha.5.1"; + version = "1.0.0-alpha.6"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-launcher"; - rev = "epoch-${version}"; - hash = "sha256-0htDjdS8431orzNnetK0ubNvjO/5748YYqeESJKTUUs="; + tag = "epoch-${version}"; + hash = "sha256-BtYnL+qkM/aw+Air5yOKH098V+TQByM5mh1DX7v+v+s="; }; useFetchCargoVendor = true; - cargoHash = "sha256-WW1o9MFxNd41ODS5p4piLQtpy277E5a/oN2yYdJc8y4="; + cargoHash = "sha256-g7Qr3C8jQg65KehXAhftdXCpEukag0w12ClvZFkxfqs="; nativeBuildInputs = [ just - pkg-config - makeBinaryWrapper - ]; - buildInputs = [ - libxkbcommon - wayland - appstream-glib - desktop-file-utils - intltool + libcosmicAppHook ]; dontUseJustBuild = true; + dontUseJustCheck = true; justFlags = [ "--set" @@ -55,19 +43,26 @@ rustPlatform.buildRustPackage rec { substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)" ''; - postInstall = '' - wrapProgram $out/bin/cosmic-launcher \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ wayland ]}" - ''; + env."CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_RUSTFLAGS" = "--cfg tokio_unstable"; - RUSTFLAGS = "--cfg tokio_unstable"; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; - meta = with lib; { + meta = { homepage = "https://github.com/pop-os/cosmic-launcher"; description = "Launcher for the COSMIC Desktop Environment"; mainProgram = "cosmic-launcher"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ nyabinary ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + nyabinary + HeitorAugustoLN + ]; + platforms = lib.platforms.linux; }; }