From 35e8ddfac39b0d20763b77ef9d26e51cff1e0f37 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Sun, 20 Jun 2021 08:01:47 -0400 Subject: [PATCH] =?UTF-8?q?newsflash:=201.4.1=20=E2=86=92=201.4.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feedreaders/newsflash/default.nix | 21 +++++++------------ .../newsflash/no-post-install.patch | 2 +- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/newsflash/default.nix b/pkgs/applications/networking/feedreaders/newsflash/default.nix index b5011c122d9528..24ec320cc431b7 100644 --- a/pkgs/applications/networking/feedreaders/newsflash/default.nix +++ b/pkgs/applications/networking/feedreaders/newsflash/default.nix @@ -15,33 +15,27 @@ , webkitgtk , glib-networking , librsvg -, gst_all_1 , xdg-utils +, gst_all_1 }: stdenv.mkDerivation rec { pname = "newsflash"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitLab { owner = "news-flash"; repo = "news_flash_gtk"; rev = version; - hash = "sha256-pskmvztKOwutXRHVnW5u68/0DAuV9Gb+Ovp2JbXiMYo="; + hash = "sha256-8W158GrvVGu5b3TG5bomK+hAF6jttZuImkmtcZOl91o="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-qq8cZplt5YWUwsXUShMDhQm3RGH2kCEBk64x6bOa50E="; + hash = "sha256-zHtD3NVWYQ5njg17Z2YmEttiK2oiq01OiAXIZofIqKI="; }; - # https://github.com/CasualX/obfstr/blob/v0.2.4/build.rs#L5 - # obfstr 0.2.4 fails to set RUSTC_BOOTSTRAP in its build script because cargo - # build scripts are forbidden from setting RUSTC_BOOTSTRAP since rustc 1.52.0 - # https://github.com/rust-lang/rust/blob/1.52.0/RELEASES.md#compatibility-notes - RUSTC_BOOTSTRAP = 1; - patches = [ # Post install tries to generate an icon cache & update the # desktop database. The gtk setup hook drop-icon-theme-cache.sh @@ -79,14 +73,14 @@ stdenv.mkDerivation rec { sqlite webkitgtk - # open link in browser - xdg-utils - # TLS support for loading external content in webkitgtk WebView glib-networking # SVG support for gdk-pixbuf librsvg + + # Open links in browser + xdg-utils ] ++ (with gst_all_1; [ # Audio & video support for webkitgtk WebView gstreamer @@ -100,5 +94,6 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.com/news-flash/news_flash_gtk"; license = licenses.gpl3Plus; maintainers = with maintainers; [ kira-bruneau ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/feedreaders/newsflash/no-post-install.patch b/pkgs/applications/networking/feedreaders/newsflash/no-post-install.patch index cfdec206e77b1c..b638f30cd44c20 100644 --- a/pkgs/applications/networking/feedreaders/newsflash/no-post-install.patch +++ b/pkgs/applications/networking/feedreaders/newsflash/no-post-install.patch @@ -1,5 +1,5 @@ diff --git a/meson.build b/meson.build -index 53f911c..361a233 100644 +index 1d7089c..1952e7f 100644 --- a/meson.build +++ b/meson.build @@ -61,5 +61,3 @@ meson.add_dist_script(