Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chatterino2: unstable-2019-05-11 -> 2.1.7 #79073

Closed
wants to merge 3 commits into from
+34 −6
Closed

chatterino2: unstable-2019-05-11 -> 2.1.7 #79073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
369381e
chatterino2: fix formatting of Nix code
strager Feb 2, 2020
d1cef6e
chatterino2: unstable-2019-05-11 -> 2.1.7
strager Feb 2, 2020
0969cb8
chatterino2: update GitHub account name
strager May 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions pkgs/applications/networking/instant-messengers/chatterino2/darwin-frameworks.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
Fix build on macOS.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Slight nit: the comment about the patch should go above the patch in the derivation, not inside the patch itself. The first place people look (or at least, the first place I look) for the reasoning behind a patch is in the derivation itself.

Patch source: https://github.com/frankosterfeld/qtkeychain/commit/95c6021e280ebe4692e7729cf626c7298db9b226

commit 95c6021e280ebe4692e7729cf626c7298db9b226
Author: Vadim Peretokin <[email protected]>
Date: Tue Sep 10 10:21:40 2019 +0200

Don't quote LIBS arguments

diff --git a/lib/qtkeychain/qt5keychain.pri b/lib/qtkeychain/qt5keychain.pri
index ee6d4e8..b3bb626 100644
--- a/lib/qtkeychain/qt5keychain.pri
+++ b/lib/qtkeychain/qt5keychain.pri
@@ -73,11 +73,11 @@ win32 {
}

macx:!ios {
- LIBS += "-framework Security" "-framework Foundation"
+ LIBS += -framework Security -framework Foundation
SOURCES += $$QT5KEYCHAIN_PWD/keychain_mac.cpp
}

ios {
- LIBS += "-framework Security" "-framework Foundation"
+ LIBS += -framework Security -framework Foundation
OBJECTIVE_SOURCES += $$QT5KEYCHAIN_PWD/keychain_ios.mm
}
13 changes: 7 additions & 6 deletions pkgs/applications/networking/instant-messengers/chatterino2/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,16 @@

mkDerivation rec {
pname = "chatterino2";
version = "unstable-2019-05-11";
version = "2.1.7";
src = fetchFromGitHub {
owner = "fourtf";
owner = "Chatterino";
repo = pname;
rev = "8c46cbf571dc8fd77287bf3186445ff52b1d1aaf";
sha256 = "0i2385hamhd9i7jdy906cfrd81cybw524j92l87c8pzrkxphignk";
rev = "v${version}";
sha256 = "0bbdzainfa7hlz5p0jfq4y04i3wix7z3i6w193906bi4gr9wilpg";
fetchSubmodules = true;
};
nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ];
strager marked this conversation as resolved.
Show resolved Hide resolved
patches = lib.optionals stdenv.isDarwin [ ./darwin-frameworks.patch ];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you add a comment about why this is necessary, and why it can't be upstreamed?

buildInputs = [ qtbase qtsvg qtmultimedia boost openssl ];
postInstall = lib.optionalString stdenv.isDarwin ''
mkdir -p "$out/Applications"
Expand All @@ -26,8 +27,8 @@ mkDerivation rec {
improved/extended version of the Twitch web chat. Chatterino 2 is
the second installment of the Twitch chat client series
"Chatterino".
'';
homepage = "https://github.com/fourtf/chatterino2";
'';
homepage = "https://github.com/Chatterino/chatterino2";
license = licenses.mit;
platforms = platforms.unix;
maintainers = with maintainers; [ rexim ];
Expand Down