From ed3dad93134b77031c8e4963a5429bde59afd70d Mon Sep 17 00:00:00 2001 From: Sebastian Ullrich Date: Sat, 11 Dec 2021 09:10:06 +0100 Subject: [PATCH] fix: bundling on Linux --- shell.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shell.nix b/shell.nix index 5aa5cf3e23..f843d82d2a 100644 --- a/shell.nix +++ b/shell.nix @@ -7,7 +7,7 @@ in { pkgs ? flakePkgs.nixpkgs, pkgsDist ? pkgs, llvmPackages ? null }: stdenv = pkgs.overrideCC pkgs.stdenv (if llvmPackages == null then flakePkgs.llvmPackages else pkgs.${"llvmPackages_${llvmPackages}"}).clang; - } rec { + } (rec { buildInputs = with pkgs; [ cmake gmp ccache ]; # https://github.com/NixOS/nixpkgs/issues/60919 hardeningDisable = [ "all" ]; @@ -17,7 +17,7 @@ in { pkgs ? flakePkgs.nixpkgs, pkgsDist ? pkgs, llvmPackages ? null }: GMP = pkgsDist.gmp.override { withStatic = true; }; GLIBC = pkgsDist.glibc; ZLIB = pkgsDist.zlib; - }; + }); with-temci = shell.overrideAttrs (old: { buildInputs = old.buildInputs ++ [ flakePkgs.temci ]; });