From d5225d54adbce0104c355bd420d804dfe695e163 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Sat, 4 Apr 2015 00:33:47 -0400 Subject: [PATCH 1/4] sl: build on Darwin --- pkgs/tools/misc/sl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/sl/default.nix b/pkgs/tools/misc/sl/default.nix index aa35461a7a9..f5bc2edf3ca 100644 --- a/pkgs/tools/misc/sl/default.nix +++ b/pkgs/tools/misc/sl/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation { url = https://github.com/mtoyoda/sl/blob/master/LICENSE; }; description = "Steam Locomotive runs across your terminal when you type 'sl'"; - platforms = with stdenv.lib.platforms; linux; + platforms = with stdenv.lib.platforms; unix; }; } From 162f870e6faf2f71ef4bc43540588310f198e11a Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Sat, 4 Apr 2015 00:53:42 -0400 Subject: [PATCH 2/4] astyle: fix on Darwin --- pkgs/development/tools/misc/astyle/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/astyle/default.nix b/pkgs/development/tools/misc/astyle/default.nix index a4004f7cb8a..770162c237e 100644 --- a/pkgs/development/tools/misc/astyle/default.nix +++ b/pkgs/development/tools/misc/astyle/default.nix @@ -12,16 +12,22 @@ stdenv.mkDerivation { sha256 = "1b0f4wm1qmgcswmixv9mwbp86hbdqxk754hml8cjv5vajvqwdpzv"; }; - sourceRoot = "astyle/build/gcc"; + sourceRoot = if (stdenv.cc.cc.isClang or false) + then "astyle/build/clang" + else "astyle/build/gcc"; + + # -s option is obsolete on Darwin and breaks build + postPatch = if stdenv.isDarwin then '' + substituteInPlace Makefile --replace "LDFLAGSr = -s" "LDFLAGSr =" + '' else null; installFlags = "INSTALL=install prefix=$$out"; meta = { homepage = "http://astyle.sourceforge.net/"; description = "Source code indenter, formatter, and beautifier for C, C++, C# and Java"; - license = "LGPL"; - - platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.lgpl3; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.simons ]; }; } From 171225ab1cb77c886c56fefa11b160b2b15b8986 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Sat, 4 Apr 2015 00:55:02 -0400 Subject: [PATCH 3/4] uncrustify: build on Darwin --- pkgs/development/tools/misc/uncrustify/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix index 27e59af34fc..f4add9a4b9e 100644 --- a/pkgs/development/tools/misc/uncrustify/default.nix +++ b/pkgs/development/tools/misc/uncrustify/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { description = "Source code beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA"; homepage = http://uncrustify.sourceforge.net/; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; }; } From a12fb39d1efe8153ecb2d25c5e007b28fd423752 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Sat, 4 Apr 2015 01:10:20 -0400 Subject: [PATCH 4/4] mediainfo: build on Darwin --- pkgs/applications/misc/mediainfo/default.nix | 2 +- pkgs/development/libraries/libmediainfo/default.nix | 2 +- pkgs/development/libraries/libzen/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index 5b41d21985f..de83cf22e04 100644 --- a/pkgs/applications/misc/mediainfo/default.nix +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; homepage = http://mediaarea.net/; license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.devhell ]; }; } diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index a8b2c04ddf5..100f91d966f 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { description = "Shared library for mediainfo"; homepage = http://mediaarea.net/; license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.devhell ]; }; } diff --git a/pkgs/development/libraries/libzen/default.nix b/pkgs/development/libraries/libzen/default.nix index 5a2723487a4..2fdeee7b5dc 100644 --- a/pkgs/development/libraries/libzen/default.nix +++ b/pkgs/development/libraries/libzen/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { description = "Shared library for libmediainfo and mediainfo"; homepage = http://mediaarea.net/; license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.devhell ]; }; }