cawbird: fix build with disallowed aliases

also clean up
This commit is contained in:
Jan Tojnar 2019-11-27 18:43:58 +01:00
parent ec3ac88ed8
commit 352775cc51
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4

View file

@ -1,6 +1,23 @@
{ stdenv, fetchFromGitHub, glib, gtk3, json-glib, sqlite, libsoup, gettext, vala { stdenv
, meson, ninja, pkgconfig, gnome3, gst_all_1, wrapGAppsHook, gobject-introspection , fetchFromGitHub
, glib-networking, python3 }: , glib
, gtk3
, json-glib
, sqlite
, libsoup
, gettext
, gspell
, vala
, meson
, ninja
, pkgconfig
, gnome3
, gst_all_1
, wrapGAppsHook
, gobject-introspection
, glib-networking
, python3
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.0.3.1"; version = "1.0.3.1";
@ -14,13 +31,34 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ nativeBuildInputs = [
meson ninja vala pkgconfig wrapGAppsHook python3 meson
ninja
vala
pkgconfig
wrapGAppsHook
python3
gobject-introspection # for setup hook gobject-introspection # for setup hook
]; ];
buildInputs = [ buildInputs = [
glib gtk3 json-glib sqlite libsoup gettext gnome3.dconf gnome3.gspell glib-networking glib
] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-bad (gst-plugins-good.override { gtkSupport = true; }) gst-libav ]); gtk3
json-glib
sqlite
libsoup
gettext
gnome3.dconf
gspell
glib-networking
] ++ (with gst_all_1; [
gstreamer
gst-plugins-base
gst-plugins-bad
(gst-plugins-good.override {
gtkSupport = true;
})
gst-libav
]);
postPatch = '' postPatch = ''
chmod +x data/meson_post_install.py # patchShebangs requires executable file chmod +x data/meson_post_install.py # patchShebangs requires executable file
@ -30,7 +68,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Native GTK Twitter client for the Linux desktop"; description = "Native GTK Twitter client for the Linux desktop";
longDescription = "Cawbird is a modern, easy and fun Twitter client. Fork of the discontinued Corebird."; longDescription = "Cawbird is a modern, easy and fun Twitter client. Fork of the discontinued Corebird.";
homepage = https://ibboard.co.uk/cawbird/; homepage = "https://ibboard.co.uk/cawbird/";
license = licenses.gpl3; license = licenses.gpl3;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with stdenv.lib.maintainers; [ jonafato schmittlauch ]; maintainers = with stdenv.lib.maintainers; [ jonafato schmittlauch ];