diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2016-10-04 12:29:09 +0200 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2016-10-04 12:29:09 +0200 |
| commit | d96c5e1fd6df28e0e2783f0d48bd081017f23355 (patch) | |
| tree | 604913b4960ccd6c305d347ea7e63d8b94e99347 /pkgs/applications | |
| parent | 94e87bd79bd04bc54efef21b93c8bbf5ffec40e8 (diff) | |
| download | nixlib-d96c5e1fd6df28e0e2783f0d48bd081017f23355.tar nixlib-d96c5e1fd6df28e0e2783f0d48bd081017f23355.tar.gz nixlib-d96c5e1fd6df28e0e2783f0d48bd081017f23355.tar.bz2 nixlib-d96c5e1fd6df28e0e2783f0d48bd081017f23355.tar.lz nixlib-d96c5e1fd6df28e0e2783f0d48bd081017f23355.tar.xz nixlib-d96c5e1fd6df28e0e2783f0d48bd081017f23355.tar.zst nixlib-d96c5e1fd6df28e0e2783f0d48bd081017f23355.zip | |
Fixing irssi-otr after change of irssi ABI.
I pick the change from this pull request: https://github.com/cryptodotis/irssi-otr/pull/60/
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/networking/irc/irssi/otr/default.nix | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/applications/networking/irc/irssi/otr/default.nix b/pkgs/applications/networking/irc/irssi/otr/default.nix index 38c2c3c2930c..4d73648edf78 100644 --- a/pkgs/applications/networking/irc/irssi/otr/default.nix +++ b/pkgs/applications/networking/irc/irssi/otr/default.nix @@ -1,5 +1,11 @@ -{ stdenv, fetchFromGitHub, libotr, automake, autoconf, libtool, glib, pkgconfig, irssi }: +{ stdenv, fetchurl, fetchFromGitHub, libotr, automake, autoconf, libtool, glib, pkgconfig, irssi }: +let + versionFix = fetchurl { + url = https://patch-diff.githubusercontent.com/raw/cryptodotis/irssi-otr/pull/60.patch; + sha256 = "18fk9nbzf3fvhvvvkrxv5l004hhimapqb6ra09m83268kbl4q3jy"; + }; +in with stdenv.lib; stdenv.mkDerivation rec { name = "irssi-otr-${version}"; @@ -12,12 +18,14 @@ stdenv.mkDerivation rec { sha256 = "1hm1whx1wzlx4fh4xf2y68rx9x6whi8bsbrhd6hqjhskg5msssrg"; }; - patchPhase = '' + prePatch = '' 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 ''; + patches = [ versionFix ]; + preConfigure = "sh ./bootstrap"; buildInputs = [ libotr automake autoconf libtool glib pkgconfig irssi ]; |