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

Commits on Nov 28, 2016

  1. Added a check to not run patchelf on Darwin systems.

    Tikhon Jelvis committed Nov 28, 2016
    Copy the full SHA
    80bee8f View commit details

Commits on Nov 29, 2016

  1. Merge pull request #20779 from TikhonJelvis/hadoop-darwin 

    hadoop-2.2.0: Added a check to not run patchelf on MacOS.
    @peti
    peti authored Nov 29, 2016
    Copy the full SHA
    d90a294 View commit details
Showing with 2 additions and 1 deletion.
  1. +2 −1 pkgs/applications/networking/cluster/hadoop/default.nix
3 changes: 2 additions & 1 deletion pkgs/applications/networking/cluster/hadoop/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
for n in "bin/"* "sbin/"*; do
sed -i $n -e "s|#!/usr/bin/env bash|#! ${bash}/bin/bash|"
done
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" bin/container-executor
'' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" bin/container-executor;
'';

installPhase = ''