chatterino2: use wrapQtAppsHook, unstable-2019-05-11 -> v2.1.7, adopt as maintainer #77994
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| repo = pname; | ||
| rev = "8c46cbf571dc8fd77287bf3186445ff52b1d1aaf"; | ||
| sha256 = "0i2385hamhd9i7jdy906cfrd81cybw524j92l87c8pzrkxphignk"; | ||
| rev = version; |
There was a problem hiding this comment.
Suggested change
| rev = version; | |
| rev = "$v${version}; |
please no letters in version.
worldofpeace
suggested changes
Jan 19, 2020
| buildInputs = [ qtbase qtsvg qtmultimedia boost openssl ]; | ||
|
|
||
| nativeBuildInputs = [ | ||
| wrapQtAppsHook |
There was a problem hiding this comment.
Suggested change
| 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.
Suggested change
| 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.
Suggested change
| { 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 |
10 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
The current
chatterino2derivation 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
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)