diff options
| author | adisbladis <adisbladis@gmail.com> | 2018-01-02 23:52:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-02 23:52:05 +0100 |
| commit | 74ac6b5fe6011d7aa502670a5b41d6f5e574d671 (patch) | |
| tree | a724b9d9c7ef21094fa169b6a7cb4cb18b27ab99 /pkgs/applications/networking | |
| parent | b33b4a76dede4f138ceaf7c0f5ceaa153763b943 (diff) | |
| parent | b68156006ad41025d5e9d338888756ac4ab6e373 (diff) | |
| download | nixlib-74ac6b5fe6011d7aa502670a5b41d6f5e574d671.tar nixlib-74ac6b5fe6011d7aa502670a5b41d6f5e574d671.tar.gz nixlib-74ac6b5fe6011d7aa502670a5b41d6f5e574d671.tar.bz2 nixlib-74ac6b5fe6011d7aa502670a5b41d6f5e574d671.tar.lz nixlib-74ac6b5fe6011d7aa502670a5b41d6f5e574d671.tar.xz nixlib-74ac6b5fe6011d7aa502670a5b41d6f5e574d671.tar.zst nixlib-74ac6b5fe6011d7aa502670a5b41d6f5e574d671.zip | |
Merge pull request #33351 from jluttine/update-rssguard-3.5.5
rssguard: 3.4.2 -> 3.5.5
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/feedreaders/rssguard/default.nix | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix index b25d4e109ebc..0a89ec6023be 100644 --- a/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -1,22 +1,27 @@ -{ stdenv, fetchgit, qmake, qtwebengine, qttools, wrapGAppsHook }: +{ stdenv, fetchFromGitHub, qmake, qtwebengine, qttools, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "rssguard-${version}"; - version = "3.4.2"; + name = "${pname}-${version}"; + pname = "rssguard"; + version = "3.5.5"; - src = fetchgit { - url = https://github.com/martinrotter/rssguard; - rev = "refs/tags/${version}"; - sha256 = "0iy0fd3qr2dm0pc6xr7sin6cjfxfa0pxhxiwzs55dhsdk9zir62s"; - # Submodules are required only for Windows (and one of them is a huge binary - # package ~400MB). See project wiki for more details. - fetchSubmodules = false; + src = fetchFromGitHub { + owner = "martinrotter"; + repo = pname; + rev = version; + sha256 = "0swjh664y1yqr1rn3ym2kicyx7r97ypr4qf7qrjl4a5q1spzsv48"; }; buildInputs = [ qtwebengine qttools ]; nativeBuildInputs = [ qmake wrapGAppsHook ]; qmakeFlags = [ "CONFIG+=release" ]; + # FIXME: This shouldn't be needed after 3.5.5. + # See: https://github.com/martinrotter/rssguard/issues/175 + preConfigure = '' + lrelease rssguard.pro + ''; + meta = with stdenv.lib; { description = "Simple RSS/Atom feed reader with online synchronization"; longDescription = '' |