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

mc: Fix darwin build

Browse Source 
We remove linux specific packages from the darwin build of midnight
commander. Also slang wouldn't build on darwin without libiconv.
This commit is contained in:
Josef Kemetmueller 2016-11-20 20:27:29 +01:00 committed by Tuomas Tynkkynen
parent 68cfc221f9
commit 23b922c98a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ncurses, pcre, libpng, zlib, readline }: { stdenv, fetchurl, ncurses, pcre, libpng, zlib, readline, libiconv }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "slang-2.3.0"; name = "slang-2.3.0";
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
sed -i -e "s|-ltermcap|-lncurses|" ./configure sed -i -e "s|-ltermcap|-lncurses|" ./configure
''; '';
configureFlags = "--with-png=${libpng.dev} --with-z=${zlib.dev} --with-pcre=${pcre.dev} --with-readline=${readline.dev}"; configureFlags = "--with-png=${libpng.dev} --with-z=${zlib.dev} --with-pcre=${pcre.dev} --with-readline=${readline.dev}";
buildInputs = [ pcre libpng zlib readline ]; buildInputs = [ pcre libpng zlib readline ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ libiconv ];
propagatedBuildInputs = [ ncurses ]; propagatedBuildInputs = [ ncurses ];
postInstall = '' postInstall = ''

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

@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "1kmysm1x7smxs9k483nin6bx1rx0av8xrqjx9yf73hc7r4anhqzp"; sha256 = "1kmysm1x7smxs9k483nin6bx1rx0av8xrqjx9yf73hc7r4anhqzp";
}; };
buildInputs = [ pkgconfig perl glib gpm slang zip unzip file gettext libX11 libICE e2fsprogs buildInputs = [ pkgconfig perl glib slang zip unzip file gettext libX11 libICE
libssh2 openssl ]; libssh2 openssl ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ];
configureFlags = [ "--enable-vfs-smb" ]; configureFlags = [ "--enable-vfs-smb" ];
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
repositories.git = git://github.com/MidnightCommander/mc.git; repositories.git = git://github.com/MidnightCommander/mc.git;
license = stdenv.lib.licenses.gpl2Plus; license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.sander ]; maintainers = [ stdenv.lib.maintainers.sander ];
platforms = stdenv.lib.platforms.linux; platforms = with stdenv.lib.platforms; linux ++ darwin;
updateWalker = true; updateWalker = true;
}; };
} }