public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #40274 from peterhoeg/u/slang 

slang: 2.3.1a -> 2.3.2
This commit is contained in:
Frederik Rietdijk 2018-05-10 10:15:26 +02:00 committed by GitHub
parent 67a8c66f68 0c810eeae1
commit dbd148d109
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/development/libraries/slang/default.nix
View File

@ -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 ];
};
}

8
pkgs/tools/misc/mc/default.nix
View File

@ -11,8 +11,12 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ perl glib slang zip unzip file gettext libX11 libICE
libssh2 openssl ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ];
buildInputs = [
perl glib slang zip unzip file gettext libX11 libICE libssh2 openssl
] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ];
enableParallelBuilding = true;
configureFlags = [ "--enable-vfs-smb" ];