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: fix install on macOS #79067

Merged
merged 2 commits into from
Feb 25, 2020
Merged

chatterino2: fix install on macOS #79067

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cdd1c21
chatterino2: fix install on macOS
strager Feb 2, 2020
1221a6b
chatterino2: fix: Could not find the Qt platform plugin "cocoa" in ""
strager Feb 2, 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
11 changes: 9 additions & 2 deletions pkgs/applications/networking/instant-messengers/chatterino2/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ mkDerivation, lib, pkgconfig, fetchFromGitHub, qtbase, qtsvg, qtmultimedia, qmake, boost, openssl }:
{ mkDerivation, stdenv, lib, pkgconfig, fetchFromGitHub, qtbase, qtsvg, qtmultimedia, qmake, boost, openssl, wrapQtAppsHook }:

mkDerivation rec {
pname = "chatterino2";
Expand All @@ -10,8 +10,15 @@ mkDerivation rec {
sha256 = "0i2385hamhd9i7jdy906cfrd81cybw524j92l87c8pzrkxphignk";
fetchSubmodules = true;
};
nativeBuildInputs = [ qmake pkgconfig ];
nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ];
Copy link
Contributor

Choose a reason for hiding this comment

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

this already uses the custom deriver that add wrapQtAppsHook, so you don't need to add it here explicitly.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I understand that the dependency is implied. I think it's clearer if the dependency is explicit, though.

Copy link
Contributor

Choose a reason for hiding this comment

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

It's not implied, the deriver adds the dependency by design, and in 19.09 we had fix several 100+ expressions to use mkDerivation instead of stdenv.mkDerivation because people didn't read the docs.
It was even requested in the PR that initially was meant fix this #78296 https://github.com/NixOS/nixpkgs/compare/c2ce79000873d1936c07ec0261c200927c2bb40c..717c2207c2a0fe702ff678af230e583e05deb177

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's not implied, the deriver adds the dependency by design

That's what I meant when I said "the dependency is implied". The dependency is implied when using mkDerivation from pkgs/development/libraries/qt-5/mkDerivation.nix (instead of stdenv.mkDerivation).

On line 20, we call wrapQtApp in postFixup (on Darwin). wrapQtApp requires a dependency on wrapQtAppsHook. That's why I added the dependency here on line 13. If expressing the dependency here is a bug, let me know so I can remove it. My current understanding is that expressing the dependency here is merely optional.

buildInputs = [ qtbase qtsvg qtmultimedia boost openssl ];
postInstall = lib.optionalString stdenv.isDarwin ''
mkdir -p "$out/Applications"
mv bin/chatterino.app "$out/Applications/"
'';
postFixup = lib.optionalString stdenv.isDarwin ''
wrapQtApp "$out/Applications/chatterino.app/Contents/MacOS/chatterino"
'';
meta = with lib; {
description = "A chat client for Twitch chat";
longDescription = ''
Expand Down