Merge pull request #182629 from winterqt/fish-irssi-bump

{ lib, stdenv, fetchFromGitHub, irssi, gmp, automake, autoconf, libtool, openssl, glib, pkg-config }:

{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, glib, openssl, irssi }:

stdenv.mkDerivation rec {

  pname = "fish-irssi";

  version = "unstable-2013-04-13";

  version = "unstable-2021-04-16";

  src = fetchFromGitHub {

    owner = "falsovsky";

    repo = "FiSH-irssi";

    rev = "e98156bebd8c150bf100b3a0356e7103bb5c20e6";

    sha256 = "0mqq7q3rnkzx4j352g1l8sv3g687d76ikjl9c7g6xw96y91kqvdp";

    rev = "fcc484f09ce6941ba2e499605270593ddd13b81a";

    hash = "sha256-KIPnz17a0CFfoPO2dZz90j+wG/dR4pv5d0iZMRf7Vkc=";

  };

  preConfigure = ''

    cp -a "${irssi.src}" "./${irssi.name}"

    configureFlags="$configureFlags --with-irssi-source=`pwd`/${irssi.name}"

  patches = [ ./irssi-include-dir.patch ];

    ./regen.sh

  '';

  nativeBuildInputs = [ cmake pkg-config ];

  installPhase = ''

    mkdir -p $out/lib/irssi/modules

    cp src/.libs/libfish.so $out/lib/irssi/modules

  '';

  buildInputs = [ glib openssl ];

  nativeBuildInputs = [ pkg-config autoconf automake ];

  buildInputs = [ gmp libtool openssl glib ];

  cmakeFlags = [ "-DIRSSI_INCLUDE_PATH:PATH=${irssi}/include" ];

  meta = {

  meta = with lib; {

    homepage = "https://github.com/falsovsky/FiSH-irssi";

    license = lib.licenses.unfree; # I can't find any mention of license

    maintainers = with lib.maintainers; [viric];

    license = licenses.mit;

    maintainers = with maintainers; [ viric ];

    platforms = platforms.unix;

  };

}

diff --git a/CMakeLists.txt b/CMakeLists.txt

index 601b92b..b440f83 100644

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -36,27 +36,10 @@ if(OPENSSL_FOUND)

     MESSAGE(STATUS "Using OpenSSL ${OPENSSL_VERSION}")

 ENDIF()

-# Sets a variable that the user can set with 

-# cmake -DIRSSI_INCLUDE_DIR:PATH=/path/to/irssi/includes .

-SET(IRSSI_INCLUDE_DIR "" CACHE PATH "Path to irssi include files")

-

-# Tries to find the irssi include files in the most common places,

-# and in the user defined directory

-FIND_PATH(IRSSI_INCLUDE_PATH

-    NAMES irssi-config.h src/common.h

-    PATHS /usr/include/irssi /usr/local/include/irssi ${IRSSI_INCLUDE_DIR}

-)

-

-# Bail out if the required irssi files werent found

-IF(NOT IRSSI_INCLUDE_PATH)

-    MESSAGE(SEND_ERROR "Could not detect the irssi include files. Please run:\n# cmake -DIRSSI_INCLUDE_DIR:PATH=/path/to/irssi/includes .")

-    RETURN()

-ENDIF()

-

 MESSAGE(STATUS "irssi includes were found on ${IRSSI_INCLUDE_PATH}")

 # Add the weirdo irssi includes directories

-INCLUDE_DIRECTORIES(${IRSSI_INCLUDE_PATH} ${IRSSI_INCLUDE_PATH}/src ${IRSSI_INCLUDE_PATH}/src/fe-common/core ${IRSSI_INCLUDE_PATH}/src/core)

+INCLUDE_DIRECTORIES(${IRSSI_INCLUDE_PATH} ${IRSSI_INCLUDE_PATH}/irssi ${IRSSI_INCLUDE_PATH}/irssi/src ${IRSSI_INCLUDE_PATH}/irssi/src/fe-common/core ${IRSSI_INCLUDE_PATH}/irssi/src/core)

 MESSAGE(STATUS "The module will be installed by default to ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/irssi/modules")

 MESSAGE(STATUS "You can change it with 'cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr .'")

  irssi = callPackage ../applications/networking/irc/irssi { };

  irssi_fish = callPackage ../applications/networking/irc/irssi/fish { };

  fish-irssi = callPackage ../applications/networking/irc/irssi/fish { };

  kirc = callPackage ../applications/networking/irc/kirc { };