-
-
Notifications
You must be signed in to change notification settings - Fork 14.5k
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.
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: use wrapQtAppsHook, unstable-2019-05-11 -> v2.1.7, adopt as maintainer #77994
Conversation
repo = pname; | ||
rev = "8c46cbf571dc8fd77287bf3186445ff52b1d1aaf"; | ||
sha256 = "0i2385hamhd9i7jdy906cfrd81cybw524j92l87c8pzrkxphignk"; | ||
rev = version; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
rev = version; | |
rev = "$v${version}; |
please no letters in version
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should use the qt specific deriver mkDerivation
which automatically adds wrapQtAppsHook
etc.
buildInputs = [ qtbase qtsvg qtmultimedia boost openssl ]; | ||
|
||
nativeBuildInputs = [ | ||
wrapQtAppsHook |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
wrapQtAppsHook |
@@ -1,28 +1,42 @@ | |||
{ stdenv, pkgconfig, fetchFromGitHub, qtbase, qtsvg, qtmultimedia, qmake, boost, openssl }: | |||
{ stdenv, pkgconfig, fetchFromGitHub, qtbase, qtsvg, qtmultimedia, qmake, boost, openssl, wrapQtAppsHook }: | |||
|
|||
stdenv.mkDerivation rec { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
stdenv.mkDerivation rec { | |
mkDerivation rec { |
@@ -1,28 +1,42 @@ | |||
{ stdenv, pkgconfig, fetchFromGitHub, qtbase, qtsvg, qtmultimedia, qmake, boost, openssl }: | |||
{ stdenv, pkgconfig, fetchFromGitHub, qtbase, qtsvg, qtmultimedia, qmake, boost, openssl, wrapQtAppsHook }: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
{ stdenv, pkgconfig, fetchFromGitHub, qtbase, qtsvg, qtmultimedia, qmake, boost, openssl, wrapQtAppsHook }: | |
{ stdenv, pkgconfig, fetchFromGitHub, qtbase, qtsvg, qtmultimedia, qmake, boost, openssl, mkDerivation }: |
@ldesgoui Your commit message |
This change reflects "new" requirements with the QT infrastructure, namely, allowing the package caller to provider a "deriver". https://nixos.org/nixpkgs/manual/#sec-language-qt
I addressed requests and force-pushed changes, thank you for taking a look @worldofpeace |
Motivation for this change
The current
chatterino2
derivation does not provide a functioning client because of the breaking changes caused by the addition ofwrapQtAppsHook
.I have also updated the sources which were out of date as the project moved to a Github organisation.
I have also added myself as a maintainer.
Things done
sandbox
innix.conf
on non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
./result/bin/
)nix path-info -S
before and after)