diff options
author | Lluís Batlle i Rossell <viric@viric.name> | 2013-04-13 18:18:44 +0200 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@viric.name> | 2013-04-13 18:27:47 +0200 |
commit | 50f3625f7024b6115c531ea8a9b850ceeb6e4220 (patch) | |
tree | 4c398b0e28cff5e7cd0de09082eddd6e20ef2e4d /pkgs/applications | |
parent | 1664c97704dcc4e8b36e50c8e630657055dcfe64 (diff) | |
download | nixlib-50f3625f7024b6115c531ea8a9b850ceeb6e4220.tar nixlib-50f3625f7024b6115c531ea8a9b850ceeb6e4220.tar.gz nixlib-50f3625f7024b6115c531ea8a9b850ceeb6e4220.tar.bz2 nixlib-50f3625f7024b6115c531ea8a9b850ceeb6e4220.tar.lz nixlib-50f3625f7024b6115c531ea8a9b850ceeb6e4220.tar.xz nixlib-50f3625f7024b6115c531ea8a9b850ceeb6e4220.tar.zst nixlib-50f3625f7024b6115c531ea8a9b850ceeb6e4220.zip |
irssi-otr: updating to a fork more up to date
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/networking/irc/irssi/otr/default.nix | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/pkgs/applications/networking/irc/irssi/otr/default.nix b/pkgs/applications/networking/irc/irssi/otr/default.nix index 309f813ed74d..ba3a56e642ed 100644 --- a/pkgs/applications/networking/irc/irssi/otr/default.nix +++ b/pkgs/applications/networking/irc/irssi/otr/default.nix @@ -1,33 +1,30 @@ -{ stdenv, fetchgit, cmake, pkgconfig, glib, python, libgcrypt, libotr -, withIrssi ? true, irssi }: +{ stdenv, fetchurl, libotr, automake, autoconf, libtool, glib, pkgconfig, irssi }: let - rev = "9ea5cc4e2e41"; + rev = "59ddcbe66a"; in with stdenv.lib; -stdenv.mkDerivation { - name = "irssi-otr-20120915-${rev}"; +stdenv.mkDerivation rec { + name = "irssi-otr-20130315-${rev}"; - src = fetchgit { - url = git://git.tuxfamily.org/gitroot/irssiotr/irssiotr.git; - inherit rev; - sha256 = "19zwxiy6h8n6zblqlcy6y9xyixp1yw2k8792rffsaaczjc5lpbvk"; + src = fetchurl { + url = "https://github.com/cryptodotis/irssi-otr/tarball/${rev}"; + name = "${name}.tar.gz"; + sha256 = "095dak0d10j6cpkwlqmk967p1wypwzvqr4wdqvb30w14dbn8dy0d"; }; patchPhase = '' - cp LICENSE README irssi + sed -i 's,/usr/include/irssi,${irssi}/include/irssi,' src/Makefile.am + sed -i "s,/usr/lib/irssi,$out/lib/irssi," configure.ac + sed -i "s,/usr/share/irssi,$out/share/irssi," help/Makefile.am ''; - cmakeFlags = "-DIRCOTR_VERSION=mydistro-git-${rev}" + - optionalString withIrssi " -DWANT_IRSSI=ON -DIRSSI_INCLUDE_DIR=${irssi}/include"; + preConfigure = "sh ./bootstrap"; - nativeBuildInputs = [ python ]; - - buildInputs = [ cmake pkgconfig glib libgcrypt libotr ]; + buildInputs = [ libotr automake autoconf libtool glib pkgconfig irssi ]; meta = { - homepage = http://irssi-otr.tuxfamily.org/; + homepage = https://github.com/cryptodotis/irssi-otr; license = "GPLv2+"; - maintainers = with stdenv.lib.maintainers; [viric]; }; } |