Merge pull request #158339 from nwg/fix-irssi-apple-silicon

Fix irssi missing symbols on Apple Silicon
This commit is contained in:
Ben Siraphob 2022-02-06 20:14:13 +00:00 committed by GitHub
commit a5921bc959
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 6 deletions

View File

@ -1,17 +1,25 @@
{ lib, stdenv, fetchurl, pkg-config, ncurses, glib, openssl, perl, libintl, libgcrypt, libotr }:
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, ncurses, glib, openssl, perl, libintl, libgcrypt, libotr, git }:
stdenv.mkDerivation rec {
pname = "irssi";
version = "1.2.3";
src = fetchurl {
url = "https://github.com/irssi/irssi/releases/download/${version}/${pname}-${version}.tar.gz";
sha256 = "09cwz5ff1i5lp35qhhmw6kbw5dwcn9pl16gpzkc92xg5sx3bgjr9";
src = fetchFromGitHub {
"owner" = "irssi";
"repo" = "irssi";
"rev" = "91dc3e4dfa1a9558c5a7fe0ea982cb9df0e2de65";
"sha256" = "efnE4vuDd7TnOBxMPduiV0/nez1jVhTjbJ0vzN4ZMcg=";
"leaveDotGit" = true;
};
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ pkg-config autoconf automake libtool git ];
buildInputs = [ ncurses glib openssl perl libintl libgcrypt libotr ];
preConfigure = ''
NOCONFIGURE=1 ./autogen.sh
'';
configureFlags = [
"--with-proxy"
"--with-bot"

View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
preConfigure = ''
tar xf ${irssi.src}
cp -a "${irssi.src}" "./${irssi.name}"
configureFlags="$configureFlags --with-irssi-source=`pwd`/${irssi.name}"
./regen.sh