Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 038429ecedd5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a7e403280efa
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 22, 2020

  1. chatterino2: use mkDerivation from qt

    @thefloweringash
    thefloweringash committed Jan 22, 2020
    Copy the full SHA
    7e0dd38 View commit details

  2. Merge pull request #78296 from thefloweringash/chatterino-qt-wrapper 

    chatterino2: use mkDerivation from qt
    @worldofpeace
    worldofpeace authored Jan 22, 2020
    Copy the full SHA
    a7e4032 View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/applications/networking/instant-messengers/chatterino2/default.nix
6 changes: 3 additions & 3 deletions pkgs/applications/networking/instant-messengers/chatterino2/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, pkgconfig, fetchFromGitHub, qtbase, qtsvg, qtmultimedia, qmake, boost, openssl }:
{ mkDerivation, lib, pkgconfig, fetchFromGitHub, qtbase, qtsvg, qtmultimedia, qmake, boost, openssl }:

stdenv.mkDerivation rec {
mkDerivation rec {
pname = "chatterino2";
version = "unstable-2019-05-11";
src = fetchFromGitHub {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ qmake pkgconfig ];
buildInputs = [ qtbase qtsvg qtmultimedia boost openssl ];
meta = with stdenv.lib; {
meta = with lib; {
description = "A chat client for Twitch chat";
longDescription = ''
Chatterino is a chat client for Twitch chat. It aims to be an