Skip to content
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.

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

Add linux environment variable for packell to nix env #1011

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -204,11 +204,11 @@ jobs:
- run:
name: Validate package versions
command:
nix-shell --pure --run 'export LANG=C.UTF-8; packell versioning validate'
make ci-versioning
- run:
name: Validate package data-dependencies
command:
nix-shell --pure --run 'export LANG=C.UTF-8; packell data-dependencies validate'
make ci-data-dependencies
- run_daml_build
- run:
name: Validate packages
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -127,13 +127,13 @@ ci-assembly:
ci-versioning:
@nix-shell \
--pure \
--run 'export LANG=C.UTF-8; packell versioning validate'
--run 'packell versioning validate'

.PHONY: ci-data-dependencies
ci-data-dependencies:
@nix-shell \
--pure \
--run 'export LANG=C.UTF-8; packell data-dependencies validate'
--run 'packell data-dependencies validate'

.PHONY: ci-local
ci-local: clean-all ci-headers-check ci-versioning ci-data-dependencies ci-build ci-validate ci-build-java ci-build-js ci-test ci-docs
Expand Down
9 changes: 8 additions & 1 deletion nix/packell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,17 @@ in
version = "$version";
src = tarball;
nativeBuildInputs = if stdenv.isLinux then [ pkgs.autoPatchelfHook ] else [ ];
buildInputs = if stdenv.isLinux then [ pkgs.gmp pkgs.libffi ] else [ ];
buildInputs = if stdenv.isLinux then [ pkgs.gmp pkgs.libffi ] else [ ];
baseInputs = [ pkgs.binutils ];
installPhase = ''
mkdir -p $out/bin
cp packell $out/bin
'';
preFixup = if stdenv.isLinux
then ''
# Set LANG for linux environments.
mkdir -p $out/nix-support
echo export LANG=C.UTF-8 > $out/nix-support/setup-hook
''
else "";
}