From dda70d9b06cfb876d34f07b668c04cd2a401f9fd Mon Sep 17 00:00:00 2001 From: ndowens Date: Sun, 12 Feb 2017 20:51:17 -0600 Subject: [PATCH 1/2] epic5: init at 2.0.1 Added conditional to support darwin Changed comment about buildInputs Added 's' to optional condition --- .../networking/irc/epic5/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/applications/networking/irc/epic5/default.nix diff --git a/pkgs/applications/networking/irc/epic5/default.nix b/pkgs/applications/networking/irc/epic5/default.nix new file mode 100644 index 00000000000..94c3833995d --- /dev/null +++ b/pkgs/applications/networking/irc/epic5/default.nix @@ -0,0 +1,34 @@ +{stdenv, fetchurl, pkgs, openssl + , ncurses, libiconv, tcl }: + +stdenv.mkDerivation rec { + name = "epic5-${version}"; + version = "2.0.1"; + + src = fetchurl { + url = "http://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/${name}.tar.xz"; + sha256 = "1ap73d5f4vccxjaaq249zh981z85106vvqmxfm4plvy76b40y9jm"; + }; + + # Darwin needs libiconv, tcl; while Linux build don't + + buildInputs = [ openssl ncurses ] + ++ stdenv.lib.optionals + stdenv.isDarwin [ libiconv tcl ]; + + postConfigure = '' + substituteInPlace bsdinstall \ + --replace /bin/cp cp \ + --replace /bin/rm rm \ + --replace /bin/chmod chmod \ + ''; + meta = with stdenv.lib; { + homepage = "http://epicsol.org/"; + description = "a IRC client that offers a great ircII interface"; + license = licenses.bsd3; + maintainers = [ maintainers.ndowens ]; + }; +} + + + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f9ddc52ea22..4784fcf1df4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13154,6 +13154,8 @@ with pkgs; inherit (gnome3) epiphany; + epic5 = callPackage ../applications/networking/irc/epic5 { }; + eq10q = callPackage ../applications/audio/eq10q { }; errbot = callPackage ../applications/networking/errbot { From 66eba1f3e0f0bb4c8b424e69c19a704e1b102a7f Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Mon, 13 Feb 2017 23:35:09 +0100 Subject: [PATCH 2/2] epic5: add configure flags --- .../networking/irc/epic5/default.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/networking/irc/epic5/default.nix b/pkgs/applications/networking/irc/epic5/default.nix index 94c3833995d..2daeab5d302 100644 --- a/pkgs/applications/networking/irc/epic5/default.nix +++ b/pkgs/applications/networking/irc/epic5/default.nix @@ -1,5 +1,4 @@ -{stdenv, fetchurl, pkgs, openssl - , ncurses, libiconv, tcl }: +{ stdenv, fetchurl, openssl, ncurses, libiconv, tcl }: stdenv.mkDerivation rec { name = "epic5-${version}"; @@ -8,20 +7,21 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/${name}.tar.xz"; sha256 = "1ap73d5f4vccxjaaq249zh981z85106vvqmxfm4plvy76b40y9jm"; - }; + }; + + # Darwin needs libiconv, tcl; while Linux build don't + buildInputs = [ openssl ncurses ] + ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv tcl ]; + + configureFlags = [ "--disable-debug" "--with-ipv6" ]; - # Darwin needs libiconv, tcl; while Linux build don't - - buildInputs = [ openssl ncurses ] - ++ stdenv.lib.optionals - stdenv.isDarwin [ libiconv tcl ]; - postConfigure = '' - substituteInPlace bsdinstall \ + substituteInPlace bsdinstall \ --replace /bin/cp cp \ --replace /bin/rm rm \ - --replace /bin/chmod chmod \ - ''; + --replace /bin/chmod chmod + ''; + meta = with stdenv.lib; { homepage = "http://epicsol.org/"; description = "a IRC client that offers a great ircII interface";