From 657ef3959bb18ede93e8d0ce5b439163b0452da5 Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Thu, 20 Jun 2013 09:25:54 +1000
Subject: [PATCH] irssi: fix build on darwin
* use `gccApple` (so we can cope with `-no-cpp-precompile`)
* add `libintlOrEmpty`
---
pkgs/applications/networking/irc/irssi/default.nix | 8 +++++---
pkgs/top-level/all-packages.nix | 7 ++++++-
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix
index 86d800e0cfe..67e06be0883 100644
--- a/pkgs/applications/networking/irc/irssi/default.nix
+++ b/pkgs/applications/networking/irc/irssi/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl}:
+{ stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintlOrEmpty }:
stdenv.mkDerivation rec {
name = "irssi-0.8.15";
@@ -8,13 +8,15 @@ stdenv.mkDerivation rec {
sha256 = "19m0aah9bhc70dnhh7kpydbsz5n35l0l9knxav1df0sic3xicbf1";
};
- buildInputs = [pkgconfig ncurses glib openssl perl];
+ buildInputs = [ pkgconfig ncurses glib openssl perl libintlOrEmpty ];
NIX_LDFLAGS = "-lncurses";
configureFlags = "--with-proxy --with-ncurses --enable-ssl --with-perl=yes";
meta = {
- homepage = http://irssi.org;
+ homepage = http://irssi.org;
+ platforms = stdenv.lib.platforms.unix;
+ maintainers = with stdenv.lib.maintainers; [ lovek323 ];
};
}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 01b8dcc2ac9..666ddcb4a4d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7612,7 +7612,12 @@ let
iptraf = callPackage ../applications/networking/iptraf { };
- irssi = callPackage ../applications/networking/irc/irssi { };
+ irssi = callPackage ../applications/networking/irc/irssi {
+ # compile with gccApple on darwin to support the -no-cpp-precompile flag
+ stdenv = if stdenv.isDarwin
+ then stdenvAdapters.overrideGCC stdenv gccApple
+ else stdenv;
+ };
irssi_fish = callPackage ../applications/networking/irc/irssi/fish { };