From 53c129591c9e6fa7d7c11a5fba7dfcb16b9cc0ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Thu, 1 Dec 2022 04:29:42 +0100 Subject: [PATCH] fix (?) nix build --- .gitignore | 3 +++ default.nix | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5dd0c831e9..82a6154f2d 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,6 @@ roc_linux_x86_64.tar.gz *.roc-format-failed *.roc-format-failed-ast-after *.roc-format-failed-ast-before + +# nix +result diff --git a/default.nix b/default.nix index cf520d7a7d..5662ea637d 100644 --- a/default.nix +++ b/default.nix @@ -3,7 +3,7 @@ nixpkgsSource ? builtins.fetchTarball { url = "https://github.com/nixos/nixpkgs/tarball/${rev}"; sha256 = "sha256-5DGKX81wIPAAiLwUmUYECpA3vop94AHHR7WmGXSsQok="; }, pkgs ? import nixpkgsSource { } -, cargoSha256 ? "sha256-Qmriwe+xSL5/pU8oqqj5Qw6H179KYqOljWl0rpPD6MY=", }: +, cargoSha256 ? "sha256-AH/cWRbshJI2pweoz24AXcDcz/+fM6cGHJU7V9GH/w4", }: # we only this file to release a nix package, use flake.nix for development let rustPlatform = pkgs.rustPlatform; @@ -78,12 +78,12 @@ in rustPlatform.buildRustPackage { # cp: to copy str.zig,list.zig... # wrapProgram pkgs.stdenv.cc: to make ld available for compiler/build/src/link.rs postInstall = if pkgs.stdenv.isLinux then '' - cp -r target/x86_64-unknown-linux-gnu/release/lib/. $out/lib + cp -r target/x86_64-unknown-linux-gnu/release/lib* $out/lib wrapProgram $out/bin/roc --set NIX_GLIBC_PATH ${nixGlibcPath} --prefix PATH : ${ pkgs.lib.makeBinPath [ pkgs.stdenv.cc ] } '' else '' - cp -r target/aarch64-apple-darwin/release/lib/. $out/lib + cp -r target/aarch64-apple-darwin/release/lib* $out/lib wrapProgram $out/bin/roc --prefix PATH : ${ pkgs.lib.makeBinPath [ pkgs.stdenv.cc ] }