git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #66821 from ehmry/irssi

irssi: build bundled OTR plug-in and remove "irssi-otr" package

commit1412af4b2cfae71d447164097d960d426e9752c0 authorMarek Mahut <marek.mahut@gmail.com> dateMon 19 Aug 2019, 13:52 (7 years ago) parentf0d1db99a1b8bc
3 files changed+3−31
pkgs/applications/networking/irc/irssi/default.nix+3−2 pkgs/applications/networking/irc/irssi/otr/default.nix−27 pkgs/top-level/all-packages.nix−2
pkgs/applications/networking/irc/irssi/default.nix+3−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintl }:
1+{ stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintl, libgcrypt, libotr }:
22
33stdenv.mkDerivation rec {
44 version = "1.2.1";
@@ -10,12 +10,13 @@ stdenv.mkDerivation rec {
1010 };
1111
1212 nativeBuildInputs = [ pkgconfig ];
13− buildInputs = [ ncurses glib openssl perl libintl ];
13+ buildInputs = [ ncurses glib openssl perl libintl libgcrypt libotr ];
1414
1515 configureFlags = [
1616 "--with-proxy"
1717 "--with-bot"
1818 "--with-perl=yes"
19+ "--with-otr=yes"
1920 "--enable-true-color"
2021 ];
2122
pkgs/applications/networking/irc/irssi/otr/default.nixdeleted−27
@@ -1,27 +0,0 @@
1−{ stdenv, fetchFromGitHub, libotr, automake, autoconf, libtool, glib, pkgconfig, irssi }:
2−
3−with stdenv.lib;
4−stdenv.mkDerivation rec {
5− name = "irssi-otr-${version}";
6− version = "1.0.2";
7−
8− src = fetchFromGitHub {
9− owner = "cryptodotis";
10− repo = "irssi-otr";
11− rev = "v${version}";
12− sha256 = "0c5wb2lg9q0i1jdhpyb5vpvxaa2xx00gvp3gdk93ix9v68gq1ppp";
13− };
14−
15− preConfigure = "sh ./bootstrap";
16−
17− nativeBuildInputs = [ pkgconfig ];
18− buildInputs = [ libotr automake autoconf libtool glib irssi ];
19−
20− NIX_CFLAGS_COMPILE="-I ${irssi}/include/irssi -I ${irssi}/include/irssi/src/core -I ${irssi}/include/irssi/src/";
21−
22− meta = {
23− homepage = https://github.com/cryptodotis/irssi-otr;
24− license = stdenv.lib.licenses.gpl2Plus;
25− platforms = stdenv.lib.platforms.linux;
26− };
27−}
pkgs/top-level/all-packages.nix−2
@@ -18947,8 +18947,6 @@ in
1894718947
1894818948 irssi_fish = callPackage ../applications/networking/irc/irssi/fish { };
1894918949
18950− irssi_otr = callPackage ../applications/networking/irc/irssi/otr { };
18951−
1895218950 ir.lv2 = callPackage ../applications/audio/ir.lv2 { };
1895318951
1895418952 bip = callPackage ../applications/networking/irc/bip { };