From 774d179790d5e062bfa2e6322d6d6d751ceed2b7 Mon Sep 17 00:00:00 2001 From: Jacob Hinkle Date: Fri, 21 Mar 2014 12:07:56 -0600 Subject: [PATCH 1/3] Started default.nix for slrn. Not finding slang --- .../networking/newsreaders/slrn/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/applications/networking/newsreaders/slrn/default.nix diff --git a/pkgs/applications/networking/newsreaders/slrn/default.nix b/pkgs/applications/networking/newsreaders/slrn/default.nix new file mode 100644 index 00000000000..3a4a7d65c84 --- /dev/null +++ b/pkgs/applications/networking/newsreaders/slrn/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, pkgs +, slang +}: + +let version = "1.0.1"; in + +stdenv.mkDerivation { + name = "slrn-${version}"; + + src = fetchurl { + url = "http://www.jedsoft.org/slrn/download/slrn-1.0.1.tar.gz"; + sha256 = "1rmaprfwvshzkv0c5vi43839cz3laqjpl306b9z0ghwyjdha1d06"; + }; + + nativeBuildInputs = [ slang ]; + + meta = { + description = "The slrn (S-Lang read news) newsreader"; + homepage = http://slrn.sourceforge.net/index.html; + license = pkgs.lib.licenses.gpl2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb5dd9b490e..10df9bbd986 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8905,6 +8905,8 @@ let skype_call_recorder = callPackage ../applications/networking/instant-messengers/skype-call-recorder { }; + slrn = callPackage ../applications/networking/newsreaders/slrn { }; + ssvnc = callPackage ../applications/networking/remote/ssvnc { }; st = callPackage ../applications/misc/st { From 715b90f784ca6e753bd78116dffddaf7a5a6b326 Mon Sep 17 00:00:00 2001 From: Jacob Hinkle Date: Fri, 21 Mar 2014 14:32:21 -0600 Subject: [PATCH 2/3] Update default.nix to use ncurses and patch hardcoded paths --- .../networking/newsreaders/slrn/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/newsreaders/slrn/default.nix b/pkgs/applications/networking/newsreaders/slrn/default.nix index 3a4a7d65c84..e079e9d9a9f 100644 --- a/pkgs/applications/networking/newsreaders/slrn/default.nix +++ b/pkgs/applications/networking/newsreaders/slrn/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgs -, slang +{ stdenv, fetchurl, pkgs, +slang, ncurses }: let version = "1.0.1"; in @@ -12,7 +12,16 @@ stdenv.mkDerivation { sha256 = "1rmaprfwvshzkv0c5vi43839cz3laqjpl306b9z0ghwyjdha1d06"; }; - nativeBuildInputs = [ slang ]; + preConfigure = '' + sed -i -e "s|-ltermcap|-lncurses|" configure + sed -i autoconf/Makefile.in src/Makefile.in \ + -e "s|/bin/cp|cp|" \ + -e "s|/bin/rm|rm|" + ''; + + configureFlags = "--with-slang=${slang}"; + + buildInputs = [ slang ncurses ]; meta = { description = "The slrn (S-Lang read news) newsreader"; From 941682efba9524e4d9ef5e111f5b708a5beb68eb Mon Sep 17 00:00:00 2001 From: Jacob Hinkle Date: Sat, 22 Mar 2014 06:58:31 -0600 Subject: [PATCH 3/3] Remove pkgs from slrn. Use stdenv.lib instead --- pkgs/applications/networking/newsreaders/slrn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/newsreaders/slrn/default.nix b/pkgs/applications/networking/newsreaders/slrn/default.nix index e079e9d9a9f..c933460af43 100644 --- a/pkgs/applications/networking/newsreaders/slrn/default.nix +++ b/pkgs/applications/networking/newsreaders/slrn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgs, +{ stdenv, fetchurl, slang, ncurses }: @@ -26,6 +26,6 @@ stdenv.mkDerivation { meta = { description = "The slrn (S-Lang read news) newsreader"; homepage = http://slrn.sourceforge.net/index.html; - license = pkgs.lib.licenses.gpl2; + license = stdenv.lib.licenses.gpl2; }; }