diff options
| author | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2015-05-06 04:39:20 +0300 |
|---|---|---|
| committer | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2015-05-06 04:39:20 +0300 |
| commit | c4103181ce7cd5363716dee1f5a76e52b99cc723 (patch) | |
| tree | 4a0c3c3e93f5be615eb6ff48adc3af17341fbd0d /pkgs | |
| parent | e70f8b391ef0b5d85bf7788ddff5fd243baa9050 (diff) | |
| parent | fdea7f43602740bde228f2eaba36d190ffec5c23 (diff) | |
| download | nixlib-c4103181ce7cd5363716dee1f5a76e52b99cc723.tar nixlib-c4103181ce7cd5363716dee1f5a76e52b99cc723.tar.gz nixlib-c4103181ce7cd5363716dee1f5a76e52b99cc723.tar.bz2 nixlib-c4103181ce7cd5363716dee1f5a76e52b99cc723.tar.lz nixlib-c4103181ce7cd5363716dee1f5a76e52b99cc723.tar.xz nixlib-c4103181ce7cd5363716dee1f5a76e52b99cc723.tar.zst nixlib-c4103181ce7cd5363716dee1f5a76e52b99cc723.zip | |
Merge pull request #7716 from joachifm/newsbeuter-2_9
newsbeuter: 2.8 -> 2.9
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/feedreaders/newsbeuter/default.nix | 20 |
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; }; } - |