JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #66821 from ehmry/irssi

Browse Source 
irssi: build bundled OTR plug-in and remove "irssi-otr" package
This commit is contained in:
Marek Mahut 2019-08-19 13:52:35 +02:00 committed by GitHub
commit 1412af4b2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/networking/irc/irssi/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintl }:
{ stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintl, libgcrypt, libotr }:
stdenv.mkDerivation rec {
version = "1.2.1";
@ -10,12 +10,13 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ ncurses glib openssl perl libintl ];
buildInputs = [ ncurses glib openssl perl libintl libgcrypt libotr ];
configureFlags = [
"--with-proxy"
"--with-bot"
"--with-perl=yes"
"--with-otr=yes"
"--enable-true-color"
];

27
pkgs/applications/networking/irc/irssi/otr/default.nix
View File

@ -1,27 +0,0 @@
{ stdenv, fetchFromGitHub, libotr, automake, autoconf, libtool, glib, pkgconfig, irssi }:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "irssi-otr-${version}";
version = "1.0.2";
src = fetchFromGitHub {
owner = "cryptodotis";
repo = "irssi-otr";
rev = "v${version}";
sha256 = "0c5wb2lg9q0i1jdhpyb5vpvxaa2xx00gvp3gdk93ix9v68gq1ppp";
};
preConfigure = "sh ./bootstrap";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libotr automake autoconf libtool glib irssi ];
NIX_CFLAGS_COMPILE="-I ${irssi}/include/irssi -I ${irssi}/include/irssi/src/core -I ${irssi}/include/irssi/src/";
meta = {
homepage = https://github.com/cryptodotis/irssi-otr;
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
};
}

2
pkgs/top-level/all-packages.nix
View File

@ -18947,8 +18947,6 @@ in
irssi_fish = callPackage ../applications/networking/irc/irssi/fish { };
irssi_otr = callPackage ../applications/networking/irc/irssi/otr { };
ir.lv2 = callPackage ../applications/audio/ir.lv2 { };
bip = callPackage ../applications/networking/irc/bip { };