public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rssguard: use fetchgit; wrapGAppsHook

Browse Source
This commit is contained in:
Jörg Thalheim 2017-06-06 00:24:11 +01:00
parent fe53a6c17c
commit 85aa14fa37
No known key found for this signature in database
GPG Key ID: CA4106B8D7CC79FA
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/applications/networking/feedreaders/rssguard/default.nix
View File

@ -1,26 +1,19 @@
{ stdenv, fetchFromGitHub, qmakeHook, qtwebengine, qttools }: { stdenv, fetchgit, qmakeHook, qtwebengine, qttools, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "rssguard-${version}"; name = "rssguard-${version}";
version = "3.4.0"; version = "3.4.0";
src = fetchFromGitHub { src = fetchgit {
owner = "martinrotter"; url = https://github.com/martinrotter/rssguard;
repo = "rssguard"; rev = "refs/tags/${version}";
# fetchFromGitHub doesn't support rev being a tag when fetchSubmodules=true,
# so need to use the hash commit. See:
# https://github.com/NixOS/nixpkgs/issues/26302
#rev = "${version}";
rev = "cb15ba92c9bc1b80e2b81d7976438e562ee1ef90";
sha256 = "1cdpfjj2lm1q2qh0w0mh505blcmi4n78458d3z3c1zn9ls9b9zsp"; sha256 = "1cdpfjj2lm1q2qh0w0mh505blcmi4n78458d3z3c1zn9ls9b9zsp";
fetchSubmodules = true; fetchSubmodules = true;
}; };
buildInputs = [ qmakeHook qtwebengine qttools ]; buildInputs = [ qtwebengine qttools ];
nativeBuildInputs = [ qmakeHook wrapGAppsHook ];
preConfigure = '' qmakeFlags = [ "CONFIG+=release" ];
qmakeFlags="$qmakeFlags CONFIG+=release"
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Simple RSS/Atom feed reader with online synchronization"; description = "Simple RSS/Atom feed reader with online synchronization";

1
pkgs/top-level/all-packages.nix
View File

@ -15163,7 +15163,6 @@ with pkgs;
polybar = callPackage ../applications/misc/polybar { }; polybar = callPackage ../applications/misc/polybar { };
rssguard = libsForQt5.callPackage ../applications/networking/feedreaders/rssguard { }; rssguard = libsForQt5.callPackage ../applications/networking/feedreaders/rssguard { };
#rssguard = libsForQt5.callPackage ../applications/networking/newsreaders/rssguard { };
scudcloud = callPackage ../applications/networking/instant-messengers/scudcloud { }; scudcloud = callPackage ../applications/networking/instant-messengers/scudcloud { };