lol

Merge pull request #7162 from spwhitt/simple_darwin_fixes

sl, astyle, uncrustify, mediainfo: Darwin fixes

+15 -9
+1 -1
pkgs/applications/misc/mediainfo/default.nix
··· 23 23 ''; 24 24 homepage = http://mediaarea.net/; 25 25 license = stdenv.lib.licenses.bsd2; 26 - platforms = stdenv.lib.platforms.linux; 26 + platforms = stdenv.lib.platforms.unix; 27 27 maintainers = [ stdenv.lib.maintainers.devhell ]; 28 28 }; 29 29 }
+1 -1
pkgs/development/libraries/libmediainfo/default.nix
··· 23 23 description = "Shared library for mediainfo"; 24 24 homepage = http://mediaarea.net/; 25 25 license = stdenv.lib.licenses.bsd2; 26 - platforms = stdenv.lib.platforms.linux; 26 + platforms = stdenv.lib.platforms.unix; 27 27 maintainers = [ stdenv.lib.maintainers.devhell ]; 28 28 }; 29 29 }
+1 -1
pkgs/development/libraries/libzen/default.nix
··· 20 20 description = "Shared library for libmediainfo and mediainfo"; 21 21 homepage = http://mediaarea.net/; 22 22 license = stdenv.lib.licenses.bsd2; 23 - platforms = stdenv.lib.platforms.linux; 23 + platforms = stdenv.lib.platforms.unix; 24 24 maintainers = [ stdenv.lib.maintainers.devhell ]; 25 25 }; 26 26 }
+10 -4
pkgs/development/tools/misc/astyle/default.nix
··· 12 12 sha256 = "1b0f4wm1qmgcswmixv9mwbp86hbdqxk754hml8cjv5vajvqwdpzv"; 13 13 }; 14 14 15 - sourceRoot = "astyle/build/gcc"; 15 + sourceRoot = if (stdenv.cc.cc.isClang or false) 16 + then "astyle/build/clang" 17 + else "astyle/build/gcc"; 18 + 19 + # -s option is obsolete on Darwin and breaks build 20 + postPatch = if stdenv.isDarwin then '' 21 + substituteInPlace Makefile --replace "LDFLAGSr = -s" "LDFLAGSr =" 22 + '' else null; 16 23 17 24 installFlags = "INSTALL=install prefix=$$out"; 18 25 19 26 meta = { 20 27 homepage = "http://astyle.sourceforge.net/"; 21 28 description = "Source code indenter, formatter, and beautifier for C, C++, C# and Java"; 22 - license = "LGPL"; 23 - 24 - platforms = stdenv.lib.platforms.linux; 29 + license = stdenv.lib.licenses.lgpl3; 30 + platforms = stdenv.lib.platforms.unix; 25 31 maintainers = [ stdenv.lib.maintainers.simons ]; 26 32 }; 27 33 }
+1 -1
pkgs/development/tools/misc/uncrustify/default.nix
··· 13 13 description = "Source code beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA"; 14 14 homepage = http://uncrustify.sourceforge.net/; 15 15 license = licenses.gpl2Plus; 16 - platforms = platforms.linux; 16 + platforms = platforms.unix; 17 17 maintainers = [ maintainers.bjornfor ]; 18 18 }; 19 19 }
+1 -1
pkgs/tools/misc/sl/default.nix
··· 27 27 url = https://github.com/mtoyoda/sl/blob/master/LICENSE; 28 28 }; 29 29 description = "Steam Locomotive runs across your terminal when you type 'sl'"; 30 - platforms = with stdenv.lib.platforms; linux; 30 + platforms = with stdenv.lib.platforms; unix; 31 31 }; 32 32 }