Skip to content

chore: fix some minor issues in the comments #2452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −8
Open

chore: fix some minor issues in the comments #2452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions compiler/ghc/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ let self =
# Terminfo does not work on older ghc cross arm and windows compilers
(!haskell-nix.haskellLib.isCrossTarget || !(stdenv.targetPlatform.isAarch32 || stdenv.targetPlatform.isAarch64 || stdenv.targetPlatform.isWindows) || builtins.compareVersions ghc-version "8.10" >= 0)

, # Wheter to build in NUMA support
, # Whether to build in NUMA support
enableNUMA ? true

, # What flavour to build. An empty string indicates no
Expand Down Expand Up @@ -282,7 +282,7 @@ let
"fp_cv_prog_ar_supports_dash_l=no"
] ++ lib.optionals (targetPlatform.isDarwin) [
"--without-libcharset"
] ++ lib.optional (targetPlatform.isGhcjs) "--target=javascript-unknown-ghcjs" # TODO use configurePlatforms once tripple is updated in nixpkgs
] ++ lib.optional (targetPlatform.isGhcjs) "--target=javascript-unknown-ghcjs" # TODO use configurePlatforms once triple is updated in nixpkgs
;

# Splicer will pull out correct variations
Expand Down Expand Up @@ -374,7 +374,7 @@ let

hadrian = hadrianProject.hsPkgs.hadrian.components.exes.hadrian;

# For a discription of hadrian command line args
# For a description of hadrian command line args
# see https://gitlab.haskell.org/ghc/ghc/blob/master/hadrian/README.md
# For build flavours and flavour transformers
# see https://gitlab.haskell.org/ghc/ghc/blob/master/hadrian/doc/flavours.md
Expand Down Expand Up @@ -927,7 +927,7 @@ haskell-nix.haskellLib.makeCompilerDeps (stdenv.mkDerivation (rec {
export XATTR=$(mktemp -d)/nothing
''
# We need to point at a stand in `windows.h` header file so that the RTS headers can
# work on the hostPlatform. We also need to work around case sensitve file system issues.
# work on the hostPlatform. We also need to work around case sensitive file system issues.
+ lib.optionalString stdenv.targetPlatform.isWindows ''
export NIX_CFLAGS_COMPILE_${
# We want this only to apply to the non windows hostPlatform (the
Expand Down
8 changes: 4 additions & 4 deletions compiler/ghcjs/ghcjs.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ let
dontPatchShebangs = true;
dontPatchELF = true;
buildPhase = ''
# Copy the ghcjs exectuables
# Copy the ghcjs executables
mkdir -p $out/bin
cp $src/${libexec}/* $out/bin

Expand All @@ -161,7 +161,7 @@ let
install_name_tool -id "@executable_path/libffi.6.dylib" "$out/bin/libffi.6.dylib"

# Modify all the references so we look for the libraries in the system location or
# @executable_path (the directory containin the exetubable itself).
# @executable_path (the directory containing the exetubable itself).
for fn in $out/bin/*; do
install_name_tool -change "${pkgs.libiconv}/lib/libiconv.dylib" /usr/lib/libiconv.dylib "$fn"
install_name_tool -change "${pkgs.stdenv.libc}/lib/libSystem.B.dylib" /usr/lib/libSystem.B.dylib "$fn"
Expand Down Expand Up @@ -211,7 +211,7 @@ let
dontPatchShebangs = true;
dontPatchELF = true;
buildPhase = ''
# Copy the ghcjs exectuables
# Copy the ghcjs executables
mkdir -p $out/bin
lndir ${ghcjs-relocatable-bin}/bin $out/bin

Expand All @@ -233,7 +233,7 @@ let
chmod -R +w $out/$(basename ${hostDb})/lib/links

# Modify all the references so we look for the libraries in the system location or
# @executable_path (the directory containin the exetubable itself).
# @executable_path (the directory containing the exetubable itself).
for fn in $out/$(basename ${hostDb})/lib/links/*; do
install_name_tool -change "${pkgs.libiconv}/lib/libiconv.dylib" /usr/lib/libiconv.dylib "$fn"
install_name_tool -change "${pkgs.stdenv.libc}/lib/libSystem.B.dylib" /usr/lib/libSystem.B.dylib "$fn"
Expand Down