From dc8aa01c91545c53431473039236dec0983aabd3 Mon Sep 17 00:00:00 2001 From: Carlos D Date: Fri, 3 Aug 2018 12:36:24 +1000 Subject: [PATCH 1/2] tldr: add support for darwin --- pkgs/tools/misc/tldr/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/tldr/default.nix b/pkgs/tools/misc/tldr/default.nix index bb03b9a809b..91dae68bebc 100644 --- a/pkgs/tools/misc/tldr/default.nix +++ b/pkgs/tools/misc/tldr/default.nix @@ -14,6 +14,11 @@ stdenv.mkDerivation rec { buildInputs = [ curl clang libzip ]; nativeBuildInputs = [ pkgconfig ]; + preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile --replace "gcc" "$CC" + substituteInPlace Makefile --replace "gcc" "$CC" + ''; + installFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { @@ -24,7 +29,7 @@ stdenv.mkDerivation rec { ''; homepage = http://tldr-pages.github.io; license = licenses.mit; - maintainers = with maintainers; [ taeer ]; - platforms = platforms.linux; + maintainers = with maintainers; [ taeer carlosdagos ]; + platforms = platforms.all; }; } From ed5531383e6610f2db659c7a145565d03c9209a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 3 Aug 2018 05:43:43 +0100 Subject: [PATCH 2/2] tldr: override makeFlags to set CC --- pkgs/tools/misc/tldr/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/tldr/default.nix b/pkgs/tools/misc/tldr/default.nix index 91dae68bebc..fcd556c5596 100644 --- a/pkgs/tools/misc/tldr/default.nix +++ b/pkgs/tools/misc/tldr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, clang, curl, libzip, pkgconfig }: +{ stdenv, fetchFromGitHub, curl, libzip, pkgconfig }: stdenv.mkDerivation rec { name = "tldr-${version}"; @@ -11,13 +11,10 @@ stdenv.mkDerivation rec { sha256 = "10ylpiqc06p0qpma72vwksd7hd107s0vlx9c6s9rz4vc3i274lb6"; }; - buildInputs = [ curl clang libzip ]; + buildInputs = [ curl libzip ]; nativeBuildInputs = [ pkgconfig ]; - preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' - substituteInPlace Makefile --replace "gcc" "$CC" - substituteInPlace Makefile --replace "gcc" "$CC" - ''; + makeFlags = ["CC=cc" "LD=cc" "CFLAGS="]; installFlags = [ "PREFIX=$(out)" ];