switch to dino from unstable to get updates automatically
This commit is contained in:
parent
bb37241a4c
commit
6c09d9e882
3 changed files with 1 additions and 100 deletions
|
@ -12,7 +12,7 @@ let
|
||||||
thunderbird
|
thunderbird
|
||||||
calibre
|
calibre
|
||||||
mupdf
|
mupdf
|
||||||
dino
|
unstable.dino
|
||||||
zotero
|
zotero
|
||||||
keepassxc
|
keepassxc
|
||||||
ding
|
ding
|
||||||
|
|
|
@ -1,98 +0,0 @@
|
||||||
{ lib, stdenv, fetchFromGitHub
|
|
||||||
, vala, cmake, ninja, wrapGAppsHook, pkgconfig, gettext
|
|
||||||
, gobject-introspection, gnome3, glib, gdk-pixbuf, gtk3, glib-networking
|
|
||||||
, xorg, libXdmcp, libxkbcommon
|
|
||||||
, libnotify, libsoup, libgee
|
|
||||||
, librsvg, libsignal-protocol-c
|
|
||||||
, fetchpatch
|
|
||||||
, libgcrypt
|
|
||||||
, epoxy
|
|
||||||
, at-spi2-core
|
|
||||||
, sqlite
|
|
||||||
, dbus
|
|
||||||
, gpgme
|
|
||||||
, pcre
|
|
||||||
, qrencode
|
|
||||||
, icu
|
|
||||||
}:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
pname = "dino";
|
|
||||||
version = "0.1.0-4f636dbd8e28237241232e1fe37fff37fbb43c6c";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "dino";
|
|
||||||
repo = "dino";
|
|
||||||
rev = "4f636dbd8e28237241232e1fe37fff37fbb43c6c";
|
|
||||||
sha256 = "1f3rhig8dckac011zq1k75bwjh4nrrsgxww1fp0iz7a88yf0l53c";
|
|
||||||
};
|
|
||||||
|
|
||||||
# patches = [
|
|
||||||
# (fetchpatch {
|
|
||||||
# # Allow newer versions of libsignal-protocol-c
|
|
||||||
# url = "https://github.com/dino/dino/commit/fbd70ceaac5ebbddfa21a580c61165bf5b861303.patch";
|
|
||||||
# sha256 = "0ydpwsmwrzfsry89fsffkfalhki4n1dw99ixjvpiingdrhjmwyl2";
|
|
||||||
# excludes = [ "plugins/signal-protocol/libsignal-protocol-c" ];
|
|
||||||
# })
|
|
||||||
# ];
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
|
||||||
vala
|
|
||||||
cmake
|
|
||||||
ninja
|
|
||||||
pkgconfig
|
|
||||||
wrapGAppsHook
|
|
||||||
gettext
|
|
||||||
];
|
|
||||||
|
|
||||||
buildInputs = [
|
|
||||||
qrencode
|
|
||||||
gobject-introspection
|
|
||||||
glib-networking
|
|
||||||
glib
|
|
||||||
libgee
|
|
||||||
gnome3.adwaita-icon-theme
|
|
||||||
sqlite
|
|
||||||
gdk-pixbuf
|
|
||||||
gtk3
|
|
||||||
libnotify
|
|
||||||
gpgme
|
|
||||||
libgcrypt
|
|
||||||
libsoup
|
|
||||||
pcre
|
|
||||||
epoxy
|
|
||||||
at-spi2-core
|
|
||||||
dbus
|
|
||||||
icu
|
|
||||||
libsignal-protocol-c
|
|
||||||
librsvg
|
|
||||||
] ++ lib.optionals (!stdenv.isDarwin) [
|
|
||||||
xorg.libxcb
|
|
||||||
xorg.libpthreadstubs
|
|
||||||
libXdmcp
|
|
||||||
libxkbcommon
|
|
||||||
];
|
|
||||||
|
|
||||||
# Dino looks for plugins with a .so filename extension, even on macOS where
|
|
||||||
# .dylib is appropriate, and despite the fact that it builds said plugins with
|
|
||||||
# that as their filename extension
|
|
||||||
#
|
|
||||||
# Therefore, on macOS rename all of the plugins to use correct names that Dino
|
|
||||||
# will load
|
|
||||||
#
|
|
||||||
# See https://github.com/dino/dino/wiki/macOS
|
|
||||||
postFixup = lib.optionalString (stdenv.isDarwin) ''
|
|
||||||
cd "$out/lib/dino/plugins/"
|
|
||||||
for f in *.dylib; do
|
|
||||||
mv "$f" "$(basename "$f" .dylib).so"
|
|
||||||
done
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
|
||||||
description = "Modern Jabber/XMPP Client using GTK/Vala";
|
|
||||||
homepage = "https://github.com/dino/dino";
|
|
||||||
license = licenses.gpl3;
|
|
||||||
platforms = platforms.linux ++ platforms.darwin;
|
|
||||||
maintainers = with maintainers; [ mic92 qyliss ];
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -8,7 +8,6 @@ in
|
||||||
(
|
(
|
||||||
self: super:
|
self: super:
|
||||||
rec {
|
rec {
|
||||||
dino = super.callPackage ./ov/dino.nix {};
|
|
||||||
lolcommits = super.callPackage ./ov/lolcommits-nixpkgs {mplayer = mplayerV4l;};
|
lolcommits = super.callPackage ./ov/lolcommits-nixpkgs {mplayer = mplayerV4l;};
|
||||||
mplayerV4l = super.callPackage ./ov/mplayer.nix {v4lSupport = true;};
|
mplayerV4l = super.callPackage ./ov/mplayer.nix {v4lSupport = true;};
|
||||||
#jami-ring-daemon = super.qt5.callPackage ./ov/jami/ring-daemon.nix {};
|
#jami-ring-daemon = super.qt5.callPackage ./ov/jami/ring-daemon.nix {};
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue