diff --git a/pkgs/by-name/ne/newsboat/package.nix b/pkgs/by-name/ne/newsboat/package.nix
index 46c7e7c21684..fcdcc8d4cc36 100644
--- a/pkgs/by-name/ne/newsboat/package.nix
+++ b/pkgs/by-name/ne/newsboat/package.nix
@@ -1,5 +1,22 @@
-{ lib, stdenv, rustPlatform, fetchFromGitHub, stfl, sqlite, curl, gettext, pkg-config, libxml2, json_c, ncurses
-, darwin, asciidoctor, libiconv, makeWrapper, nix-update-script }:
+{
+  lib,
+  stdenv,
+  rustPlatform,
+  fetchFromGitHub,
+  stfl,
+  sqlite,
+  curl,
+  gettext,
+  pkg-config,
+  libxml2,
+  json_c,
+  ncurses,
+  darwin,
+  asciidoctor,
+  libiconv,
+  makeWrapper,
+  nix-update-script,
+}:
 
 rustPlatform.buildRustPackage rec {
   pname = "newsboat";
@@ -21,14 +38,35 @@ rustPlatform.buildRustPackage rec {
       --replace "ncurses5.4" "ncurses"
   '';
 
-  nativeBuildInputs = [
-    pkg-config
-    asciidoctor
-    gettext
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeWrapper ncurses ];
+  nativeBuildInputs =
+    [
+      pkg-config
+      asciidoctor
+      gettext
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      makeWrapper
+      ncurses
+    ];
 
-  buildInputs = [ stfl sqlite curl libxml2 json_c ncurses ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Security Foundation libiconv gettext ]);
+  buildInputs =
+    [
+      stfl
+      sqlite
+      curl
+      libxml2
+      json_c
+      ncurses
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin (
+      with darwin.apple_sdk.frameworks;
+      [
+        Security
+        Foundation
+        libiconv
+        gettext
+      ]
+    );
 
   postBuild = ''
     make -j $NIX_BUILD_CORES prefix="$out"
@@ -47,6 +85,7 @@ rustPlatform.buildRustPackage rec {
     make -j $NIX_BUILD_CORES test
   '';
 
+<<<<<<< HEAD
   postInstall = ''
     make -j $NIX_BUILD_CORES prefix="$out" install
   '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
@@ -54,18 +93,32 @@ rustPlatform.buildRustPackage rec {
       wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib"
     done
   '';
+=======
+  postInstall =
+    ''
+      make -j $NIX_BUILD_CORES prefix="$out" install
+    ''
+    + lib.optionalString stdenv.isDarwin ''
+      for prog in $out/bin/*; do
+        wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib"
+      done
+    '';
+>>>>>>> f6bae49a470c (newsboat: reformat unix nixfmt-rfc-style)
 
   passthru = {
     updateScript = nix-update-script { };
   };
 
   meta = {
-    homepage    = "https://newsboat.org/";
-    changelog   = "https://github.com/newsboat/newsboat/blob/${src.rev}/CHANGELOG.md";
+    homepage = "https://newsboat.org/";
+    changelog = "https://github.com/newsboat/newsboat/blob/${src.rev}/CHANGELOG.md";
     description = "Fork of Newsbeuter, an RSS/Atom feed reader for the text console";
-    maintainers = with lib.maintainers; [ dotlambda nicknovitski ];
-    license     = lib.licenses.mit;
-    platforms   = lib.platforms.unix;
+    maintainers = with lib.maintainers; [
+      dotlambda
+      nicknovitski
+    ];
+    license = lib.licenses.mit;
+    platforms = lib.platforms.unix;
     mainProgram = "newsboat";
   };
 }