diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2770e20c0087..7953b58eefae 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6065,7 +6065,7 @@ name = "Celine Mercier"; }; metadark = { - email = "kira.bruneau@gmail.com"; + email = "kira.bruneau@pm.me"; name = "Kira Bruneau"; github = "metadark"; githubId = 382041; diff --git a/pkgs/applications/networking/feedreaders/newsflash/default.nix b/pkgs/applications/networking/feedreaders/newsflash/default.nix index 36dbd40a426a..6c135439322a 100644 --- a/pkgs/applications/networking/feedreaders/newsflash/default.nix +++ b/pkgs/applications/networking/feedreaders/newsflash/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , rustPlatform , fetchFromGitLab , meson @@ -17,7 +18,7 @@ , gst_all_1 }: -rustPlatform.buildRustPackage rec { +stdenv.mkDerivation rec { pname = "newsflash"; version = "1.3.0"; @@ -28,7 +29,11 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Vu8PXdnayrglAFVfO+WZTzk4Qrb/3uqzQIwClnRHto8="; }; - cargoHash = "sha256-dWumQi/Bk7w2C8zVVExxguWchZU+K2qTC02otsiK9jA="; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-dWumQi/Bk7w2C8zVVExxguWchZU+K2qTC02otsiK9jA="; + }; patches = [ # Post install tries to generate an icon cache & update the @@ -54,7 +59,11 @@ rustPlatform.buildRustPackage rec { # Provides glib-compile-resources to compile gresources glib - ]; + ] ++ (with rustPlatform; [ + cargoSetupHook + rust.cargo + rust.rustc + ]); buildInputs = [ gtk3 @@ -76,13 +85,6 @@ rustPlatform.buildRustPackage rec { gst-plugins-bad ]); - # Unset default rust phases to use meson & ninja instead - configurePhase = null; - buildPhase = null; - checkPhase = null; - installPhase = null; - installCheckPhase = null; - meta = with lib; { description = "A modern feed reader designed for the GNOME desktop"; homepage = "https://gitlab.com/news-flash/news_flash_gtk";