about summary refs log tree commit diff
path: root/pkgs/applications/networking/feedreaders
diff options
context:
space:
mode:
authorJoachim Fasting <joachifm@fastmail.fm>2015-05-05 14:06:47 +0200
committerJoachim Fasting <joachifm@fastmail.fm>2015-05-05 14:49:09 +0200
commitfdea7f43602740bde228f2eaba36d190ffec5c23 (patch)
tree3f3622d319a3f286e4d7ab7e8c75ac242be75fa3 /pkgs/applications/networking/feedreaders
parentb9ba937f81b887d24e5e772777d37b056bb53409 (diff)
downloadnixlib-fdea7f43602740bde228f2eaba36d190ffec5c23.tar
nixlib-fdea7f43602740bde228f2eaba36d190ffec5c23.tar.gz
nixlib-fdea7f43602740bde228f2eaba36d190ffec5c23.tar.bz2
nixlib-fdea7f43602740bde228f2eaba36d190ffec5c23.tar.lz
nixlib-fdea7f43602740bde228f2eaba36d190ffec5c23.tar.xz
nixlib-fdea7f43602740bde228f2eaba36d190ffec5c23.tar.zst
nixlib-fdea7f43602740bde228f2eaba36d190ffec5c23.zip
newsbeuter: 2.8 -> 2.9
Also set installFlags rather than call make install directly.

This release has a logic error which causes the newsbeuter cache to be
deleted on exit iff urls contains a single URL [1] (no problem for n > 1).

[1]: https://github.com/akrennmair/newsbeuter/pull/179
Diffstat (limited to 'pkgs/applications/networking/feedreaders')
-rw-r--r--pkgs/applications/networking/feedreaders/newsbeuter/default.nix20
1 files changed, 9 insertions, 11 deletions
diff --git a/pkgs/applications/networking/feedreaders/newsbeuter/default.nix b/pkgs/applications/networking/feedreaders/newsbeuter/default.nix
index 183df058effb..8158c458afc7 100644
--- a/pkgs/applications/networking/feedreaders/newsbeuter/default.nix
+++ b/pkgs/applications/networking/feedreaders/newsbeuter/default.nix
@@ -2,11 +2,11 @@
 , gettext, libiconv, makeWrapper, perl }:
 
 stdenv.mkDerivation rec {
-  name = "newsbeuter-2.8";
+  name = "newsbeuter-2.9";
 
   src = fetchurl {
     url = "http://www.newsbeuter.org/downloads/${name}.tar.gz";
-    sha256 = "013qi8yghpms2qq1b3xbrlmfgpj0ybgk0qhj245ni4kpxila0wn8";
+    sha256 = "1j1x0hgwxz11dckk81ncalgylj5y5fgw5bcmp9qb5hq9kc0vza3l";
 
   };
 
@@ -22,14 +22,13 @@ stdenv.mkDerivation rec {
     export LDFLAGS=-lncursesw
   '';
 
-  installPhase = ''
-    DESTDIR=$out prefix=\"\" make install
-  ''
-    + stdenv.lib.optionalString stdenv.isDarwin ''
-      for prog in $out/bin/*; do
-        wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib"
-      done
-    '';
+  installFlags = [ "DESTDIR=$(out)" "prefix=" ];
+
+  installPhase = stdenv.lib.optionalString stdenv.isDarwin ''
+    for prog in $out/bin/*; do
+      wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib"
+    done
+  '';
 
   meta = {
     homepage    = http://www.newsbeuter.org;
@@ -39,4 +38,3 @@ stdenv.mkDerivation rec {
     platforms   = stdenv.lib.platforms.unix;
   };
 }
-