Merge pull request #311145 from TomaSajt/odin

odin: fix patches for darwin

authored by Emily Trau and committed by GitHub 311cd0a3 e5d9b197

+5 -7
+5 -7
pkgs/development/compilers/odin/default.nix
··· 30 LLVM_CONFIG = "${llvmPackages.llvm.dev}/bin/llvm-config"; 31 32 postPatch = lib.optionalString stdenv.isDarwin '' 33 - sed -i src/main.cpp \ 34 - -e 's|-syslibroot /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk|-syslibroot ${MacOSX-SDK}|' 35 - '' + '' 36 - sed -i build_odin.sh \ 37 - -e 's/^GIT_SHA=.*$/GIT_SHA=/' \ 38 - -e 's/LLVM-C/LLVM/' \ 39 - -e 's/framework System/lSystem/' 40 patchShebangs build_odin.sh 41 ''; 42
··· 30 LLVM_CONFIG = "${llvmPackages.llvm.dev}/bin/llvm-config"; 31 32 postPatch = lib.optionalString stdenv.isDarwin '' 33 + substituteInPlace src/linker.cpp \ 34 + --replace-fail '/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk' ${MacOSX-SDK} 35 + '' + '' 36 + substituteInPlace build_odin.sh \ 37 + --replace-fail '-framework System' '-lSystem' 38 patchShebangs build_odin.sh 39 ''; 40