Merge pull request #70168 from schmittlauch/cawbird

cawbird: init at 1.0.1, replace corebird
This commit is contained in:
Lassulus 2019-10-02 23:05:10 +02:00 committed by GitHub
commit f9b2528866
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 15 deletions

View File

@ -1,20 +1,20 @@
{ stdenv, fetchFromGitHub, glib, gtk3, json-glib, sqlite, libsoup, gettext, vala_0_40 { stdenv, fetchFromGitHub, glib, gtk3, json-glib, sqlite, libsoup, gettext, vala
, meson, ninja, pkgconfig, gnome3, gst_all_1, wrapGAppsHook, gobject-introspection , meson, ninja, pkgconfig, gnome3, gst_all_1, wrapGAppsHook, gobject-introspection
, glib-networking, python3 }: , glib-networking, python3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.7.4"; version = "1.0.1";
pname = "corebird"; pname = "cawbird";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "baedert"; owner = "IBBoard";
repo = "corebird"; repo = "cawbird";
rev = version; rev = "v${version}";
sha256 = "0qjffsmg1hm64dgsbkfwzbzy9q4xa1q4fh4h8ni8a2b1p3h80x7n"; sha256 = "sha256:0bk33fh32nnv6ya6j0ij34abw6a3g6m8fq13303slhhja8xhvmb1";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
meson ninja vala_0_40 pkgconfig wrapGAppsHook python3 meson ninja vala pkgconfig wrapGAppsHook python3
gobject-introspection # for setup hook gobject-introspection # for setup hook
]; ];
@ -27,12 +27,12 @@ stdenv.mkDerivation rec {
patchShebangs data/meson_post_install.py patchShebangs data/meson_post_install.py
''; '';
meta = { meta = with stdenv.lib; {
description = "Native GTK Twitter client for the Linux desktop"; description = "Native GTK Twitter client for the Linux desktop";
longDescription = "Corebird is a modern, easy and fun Twitter client."; longDescription = "Cawbird is a modern, easy and fun Twitter client. Fork of the discontinued Corebird.";
homepage = https://corebird.baedert.org/; homepage = https://ibboard.co.uk/cawbird/;
license = stdenv.lib.licenses.gpl3; license = licenses.gpl3;
platforms = stdenv.lib.platforms.linux; platforms = platforms.linux;
maintainers = [ stdenv.lib.maintainers.jonafato ]; maintainers = with stdenv.lib.maintainers; [ jonafato schmittlauch ];
}; };
} }

View File

@ -1305,6 +1305,8 @@ in
cardpeek = callPackage ../applications/misc/cardpeek { }; cardpeek = callPackage ../applications/misc/cardpeek { };
cawbird = callPackage ../applications/networking/cawbird { };
cde = callPackage ../tools/package-management/cde { }; cde = callPackage ../tools/package-management/cde { };
cdemu-daemon = callPackage ../misc/emulators/cdemu/daemon.nix { }; cdemu-daemon = callPackage ../misc/emulators/cdemu/daemon.nix { };
@ -1379,7 +1381,7 @@ in
copyright-update = callPackage ../tools/text/copyright-update { }; copyright-update = callPackage ../tools/text/copyright-update { };
corebird = callPackage ../applications/networking/corebird { }; corebird = throw "corebird has been discontinued, use cawbird instead";
inherit (callPackage ../tools/misc/coreboot-utils { }) inherit (callPackage ../tools/misc/coreboot-utils { })
msrtool msrtool