lol

slang: fix some dependants and split into outputs

These termcap and similar (nonexistent) libraries are baffling me.

+19 -9
+6 -4
pkgs/development/libraries/newt/default.nix
··· 14 14 15 15 buildInputs = [ slang popt ]; 16 16 17 + NIX_LDFLAGS = "-lncurses"; 18 + 17 19 crossAttrs = { 18 20 makeFlags = "CROSS_COMPILE=${stdenv.cross.config}-"; 19 21 }; 20 22 21 - meta = { 23 + meta = with stdenv.lib; { 22 24 homepage = https://fedorahosted.org/newt/; 23 25 description = "Library for color text mode, widget based user interfaces"; 24 26 25 - license = stdenv.lib.licenses.lgpl2; 26 - platforms = stdenv.lib.platforms.linux; 27 - maintainers = [ stdenv.lib.maintainers.viric ]; 27 + license = licenses.lgpl2; 28 + platforms = platforms.linux; 29 + maintainers = [ maintainers.viric ]; 28 30 }; 29 31 }
+13 -5
pkgs/development/libraries/slang/default.nix
··· 7 7 sha256 = "0aqd2cjabj6nhd4r3dc4vhqif2bf3dmqnrn2gj0xm4gqyfd177jy"; 8 8 }; 9 9 10 + outputs = [ "dev" "out" "doc" ]; 11 + 10 12 # Fix some wrong hardcoded paths 11 13 preConfigure = '' 12 14 sed -i -e "s|/usr/lib/terminfo|${ncurses.out}/lib/terminfo|" configure ··· 15 17 sed -i -e "s|-ltermcap|-lncurses|" ./configure 16 18 ''; 17 19 configureFlags = "--with-png=${libpng} --with-z=${zlib} --with-pcre=${pcre} --with-readline=${readline}"; 18 - buildInputs = [ncurses pcre libpng zlib readline]; 20 + buildInputs = [ pcre libpng zlib readline ]; 21 + propagatedBuildInputs = [ ncurses ]; 19 22 20 - meta = { 23 + postInstall = '' 24 + find "$out"/lib/ -name '*.so' -exec chmod +x "{}" \; 25 + sed '/^Libs:/s/$/ -lncurses/' -i "$dev"/lib/pkgconfig/slang.pc 26 + ''; 27 + 28 + meta = with stdenv.lib; { 21 29 description = "A multi-platform programmer's library designed to allow a developer to create robust software"; 22 30 homepage = http://www.jedsoft.org/slang/; 23 - license = stdenv.lib.licenses.gpl2Plus; 24 - platforms = stdenv.lib.platforms.unix; 25 - maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; 31 + license = licenses.gpl2Plus; 32 + platforms = platforms.unix; 33 + maintainers = [ maintainers.fuuzetsu ]; 26 34 }; 27 35 }