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: 8d3aa2f2b9e9
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d482caf1bf33
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 1, 2018

  1. exa: fix build on darwin

    @vbgl
    vbgl committed Mar 1, 2018
    Copy the full SHA
    1aae247 View commit details

  2. Merge pull request #36179 from vbgl/exa-darwin 

    exa: fix build on darwin
    @Mic92
    Mic92 authored Mar 1, 2018
    Copy the full SHA
    d482caf View commit details
Showing with 7 additions and 2 deletions.
  1. +7 −2 pkgs/tools/misc/exa/default.nix
9 changes: 7 additions & 2 deletions pkgs/tools/misc/exa/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{ stdenv, fetchFromGitHub, rustPlatform, cmake, perl, pkgconfig, zlib }:
{ stdenv, fetchFromGitHub, rustPlatform, cmake, perl, pkgconfig, zlib
, darwin, libiconv
}:

with rustPlatform;

@@ -16,7 +18,10 @@ buildRustPackage rec {
};

nativeBuildInputs = [ cmake pkgconfig perl ];
buildInputs = [ zlib ];
buildInputs = [ zlib ]
++ stdenv.lib.optionals stdenv.isDarwin [
libiconv darwin.apple_sdk.frameworks.Security ]
;

# Some tests fail, but Travis ensures a proper build
doCheck = false;