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

Commits on Mar 29, 2019

  1. iterm2: fix build 

    During iterm2's build, xcodebuild invokes $LD and passes it options such
as -isysroot. These options are intended for the linker driver (clang),
not for the linker directly. ld64 ($LD) does not recognize these
options, causing iterm2's build to fail.

Set $LD to $CC (clang) as intended, making iterm2's build succeed.
    @strager
    strager committed Mar 29, 2019
    Copy the full SHA
    689e1ef View commit details

Commits on Mar 31, 2019

  1. Merge pull request #58517 from strager/iterm2 

    iterm2: fix build
    @infinisil
    infinisil authored Mar 31, 2019
    Copy the full SHA
    4f25405 View commit details
Showing with 1 addition and 0 deletions.
  1. +1 −0 pkgs/applications/misc/iterm2/default.nix
1 change: 1 addition & 0 deletions pkgs/applications/misc/iterm2/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
postPatch = ''
sed -i -e 's/CODE_SIGN_IDENTITY = "Developer ID Application"/CODE_SIGN_IDENTITY = ""/g' ./iTerm2.xcodeproj/project.pbxproj
'';
preConfigure = "LD=$CC";
makeFlagsArray = ["Deployment"];
installPhase = ''
mkdir -p "$out/Applications"