Merge pull request #304988 from sentientmonkey/x3270-fix-for-darwin

x3270: 4.0ga9 -> 4.3ga8

pkgs/applications/terminal-emulators/x3270/default.nix

@@ -1,39 +1,72 @@
-{ lib, stdenv, fetchurl, m4, expat
+{ stdenv
-, libX11, libXt, libXaw, libXmu, bdftopcf, mkfontdir
+, darwin
-, fontadobe100dpi, fontadobeutopia100dpi, fontbh100dpi
+, lib
-, fontbhlucidatypewriter100dpi, fontbitstream100dpi
+, libiconv
+, fetchurl
+, m4
+, expat
+, libX11
+, libXt
+, libXaw
+, libXmu
+, bdftopcf
+, mkfontdir
+, fontadobe100dpi
+, fontadobeutopia100dpi
+, fontbh100dpi
+, fontbhlucidatypewriter100dpi
+, fontbitstream100dpi
 , tcl
-, ncurses }:
+, ncurses
-
+}:
 let
   majorVersion = "4";
-  minorVersion = "0";
+  minorVersion = "3";
-  versionSuffix = "ga9";
+  versionSuffix = "ga8";
-in stdenv.mkDerivation rec {
+in
+stdenv.mkDerivation rec {
   pname = "x3270";
   version = "${majorVersion}.${minorVersion}${versionSuffix}";
 
   src = fetchurl {
-    url = "http://x3270.bgp.nu/download/0${majorVersion}.0${minorVersion}/suite3270-${version}-src.tgz";
+    url =
-    sha256 = "0km24rgll0s4ji6iz8lvy5ra76ds162s95y33w5px6697cwqkp9j";
+      "http://x3270.bgp.nu/download/0${majorVersion}.0${minorVersion}/suite3270-${version}-src.tgz";
+    sha256 = "sha256-gcC6REfZentIPEDhGznUSYu8mvVfpPeMz/Bks+N43Fk=";
   };
 
-  buildFlags = [ "unix" ];
+  buildFlags = lib.optional stdenv.isLinux "unix";
 
-  postConfigure = ''
+  configureFlags = lib.optionals stdenv.isDarwin [
-    pushd c3270 ; ./configure ; popd
+    "--enable-c3270"
+    "--enable-pr3270"
+    "--enable-s3270"
+    "--enable-tcl3270"
+  ];
+
+  postBuild = ''
+    make install.man
   '';
 
+  pathsToLink = [ "/share/man" ];
+
   nativeBuildInputs = [ m4 ];
   buildInputs = [
     expat
-    libX11 libXt libXaw libXmu bdftopcf mkfontdir
+    libX11
-    fontadobe100dpi fontadobeutopia100dpi fontbh100dpi
+    libXt
-    fontbhlucidatypewriter100dpi fontbitstream100dpi
+    libXaw
+    libXmu
+    bdftopcf
+    mkfontdir
+    fontadobe100dpi
+    fontadobeutopia100dpi
+    fontbh100dpi
+    fontbhlucidatypewriter100dpi
+    fontbitstream100dpi
     tcl
     ncurses
     expat
-  ];
+  ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ];
 
   meta = with lib; {
     description = "IBM 3270 terminal emulator for the X Window System";