Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8b6e575c92aa
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3633a2bdd11b
Choose a head ref
  • 3 commits
  • 1 file changed
  • 3 contributors

Commits on Aug 3, 2018

  1. tldr: add support for darwin

    @carlosdagos
    carlosdagos committed Aug 3, 2018
    Copy the full SHA
    dc8aa01 View commit details

  2. tldr: override makeFlags to set CC

    @Mic92
    Mic92 committed Aug 3, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ed55313 View commit details

  3. Merge pull request #44384 from carlosdagos/tldr-macos 

    tldr: add support for darwin
    @Mic92
    Mic92 authored Aug 3, 2018
    Copy the full SHA
    3633a2b View commit details
Showing with 6 additions and 4 deletions.
  1. +6 −4 pkgs/tools/misc/tldr/default.nix
10 changes: 6 additions & 4 deletions pkgs/tools/misc/tldr/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, clang, curl, libzip, pkgconfig }:
{ stdenv, fetchFromGitHub, curl, libzip, pkgconfig }:

stdenv.mkDerivation rec {
name = "tldr-${version}";
@@ -11,9 +11,11 @@ stdenv.mkDerivation rec {
sha256 = "10ylpiqc06p0qpma72vwksd7hd107s0vlx9c6s9rz4vc3i274lb6";
};

buildInputs = [ curl clang libzip ];
buildInputs = [ curl libzip ];
nativeBuildInputs = [ pkgconfig ];

makeFlags = ["CC=cc" "LD=cc" "CFLAGS="];

installFlags = [ "PREFIX=$(out)" ];

meta = with stdenv.lib; {
@@ -24,7 +26,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;
};
}