cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #114678 from MetaDark/newsflash

Browse source 
newsflash: use cargoSetupHook instead of buildRustPackage
This commit is contained in:
Daniël de Kok 2021-02-28 19:33:28 +01:00 committed by GitHub
commit ecf26ca684
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
maintainers/maintainer-list.nix
View file

@ -6065,7 +6065,7 @@
name = "Celine Mercier"; name = "Celine Mercier";
}; };
metadark = { metadark = {
email = "kira.bruneau@gmail.com"; email = "kira.bruneau@pm.me";
name = "Kira Bruneau"; name = "Kira Bruneau";
github = "metadark"; github = "metadark";
githubId = 382041; githubId = 382041;

22
pkgs/applications/networking/feedreaders/newsflash/default.nix
View file

@ -1,4 +1,5 @@
{ lib { lib
, stdenv
, rustPlatform , rustPlatform
, fetchFromGitLab , fetchFromGitLab
, meson , meson
@ -17,7 +18,7 @@
, gst_all_1 , gst_all_1
}: }:
rustPlatform.buildRustPackage rec { stdenv.mkDerivation rec {
pname = "newsflash"; pname = "newsflash";
version = "1.3.0"; version = "1.3.0";
@ -28,7 +29,11 @@ rustPlatform.buildRustPackage rec {
hash = "sha256-Vu8PXdnayrglAFVfO+WZTzk4Qrb/3uqzQIwClnRHto8="; hash = "sha256-Vu8PXdnayrglAFVfO+WZTzk4Qrb/3uqzQIwClnRHto8=";
}; };
cargoHash = "sha256-dWumQi/Bk7w2C8zVVExxguWchZU+K2qTC02otsiK9jA="; cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-dWumQi/Bk7w2C8zVVExxguWchZU+K2qTC02otsiK9jA=";
};
patches = [ patches = [
# Post install tries to generate an icon cache & update the # Post install tries to generate an icon cache & update the
@ -54,7 +59,11 @@ rustPlatform.buildRustPackage rec {
# Provides glib-compile-resources to compile gresources # Provides glib-compile-resources to compile gresources
glib glib
]; ] ++ (with rustPlatform; [
cargoSetupHook
rust.cargo
rust.rustc
]);
buildInputs = [ buildInputs = [
gtk3 gtk3
@ -76,13 +85,6 @@ rustPlatform.buildRustPackage rec {
gst-plugins-bad 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; { meta = with lib; {
description = "A modern feed reader designed for the GNOME desktop"; description = "A modern feed reader designed for the GNOME desktop";
homepage = "https://gitlab.com/news-flash/news_flash_gtk"; homepage = "https://gitlab.com/news-flash/news_flash_gtk";