From 6e62f01912afe4cd81e993945d731c1cccd9b281 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 10 May 2018 13:25:31 +0800 Subject: slang: 2.3.1a -> 2.3.2 --- pkgs/development/libraries/slang/default.nix | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/slang/default.nix b/pkgs/development/libraries/slang/default.nix index 70e9d6181d9..bcce457e78e 100644 --- a/pkgs/development/libraries/slang/default.nix +++ b/pkgs/development/libraries/slang/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, ncurses, pcre, libpng, zlib, readline, libiconv }: stdenv.mkDerivation rec { - name = "slang-2.3.1a"; + name = "slang-2.3.2"; src = fetchurl { url = "http://www.jedsoft.org/releases/slang/${name}.tar.bz2"; - sha256 = "0dlcy0hn0j6cj9qj5x6hpb0axifnvzzmv5jqq0wq14fygw0c7w2l"; + sha256 = "06p379fqn6w38rdpqi98irxi2bf4llb0rja3dlgkqz7nqh7kp7pw"; }; outputs = [ "out" "dev" "man" "doc" ]; @@ -16,10 +16,23 @@ stdenv.mkDerivation rec { sed -i -e "s|/bin/ln|ln|" src/Makefile.in sed -i -e "s|-ltermcap|-lncurses|" ./configure ''; - configureFlags = "--with-png=${libpng.dev} --with-z=${zlib.dev} --with-pcre=${pcre.dev} --with-readline=${readline.dev}"; - buildInputs = [ pcre libpng zlib readline ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ libiconv ]; + + configureFlags = [ + "--with-png=${libpng.dev}" + "--with-z=${zlib.dev}" + "--with-pcre=${pcre.dev}" + "--with-readline=${readline.dev}" + ]; + + buildInputs = [ + pcre libpng zlib readline + ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ libiconv ]; + propagatedBuildInputs = [ ncurses ]; + # slang 2.3.2 does not support parallel building + enableParallelBuilding = false; + postInstall = '' find "$out"/lib/ -name '*.so' -exec chmod +x "{}" \; sed '/^Libs:/s/$/ -lncurses/' -i "$dev"/lib/pkgconfig/slang.pc @@ -29,7 +42,7 @@ stdenv.mkDerivation rec { description = "A multi-platform programmer's library designed to allow a developer to create robust software"; homepage = http://www.jedsoft.org/slang/; license = licenses.gpl2Plus; + maintainers = with maintainers; [ fuuzetsu ]; platforms = platforms.unix; - maintainers = [ maintainers.fuuzetsu ]; }; } -- cgit 1.4.1