ATproto Nix User Repo

fix tar command

Changed files
+11 -19
overlays
pkgs
microcosm
+7 -16
overlays/cfg-if-fix.nix
··· 1 - final: prev: { 2 - buildPackage = args: 3 - let 4 - pname = args.pname or "unknown"; 5 - version = args.version or "unknown"; 6 - in 7 - builtins.trace "Building ${pname}-${version}" ( 8 - prev.buildPackage (args // ( 9 - if pname == "cfg-if" then { 10 - unpackPhase = '' 11 - tar -xzf $src --no-same-owner 12 - ''; 13 - } else { } 14 - )) 15 - ); 16 - } 1 + self: super: { 2 + "cfg-if" = super."cfg-if".overrideAttrs (old: { 3 + unpackPhase = '' 4 + tar -xzf $src --no-same-owner 5 + ''; 6 + }); 7 + }
+4 -3
pkgs/microcosm/default.nix
··· 8 8 sha256 = "sha256-swdAcsjRWnj9abmnrce5LzeKRK+LHm8RubCEIuk+53c="; 9 9 }; 10 10 11 + crane-overrides = pkgs.callPackage ../../overlays/default.nix { }; 12 + 11 13 commonEnv = { 12 14 LIBCLANG_PATH = pkgs.lib.makeLibraryPath [ pkgs.llvmPackages.libclang.lib ]; 13 15 OPENSSL_NO_VENDOR = "1"; 14 16 OPENSSL_LIB_DIR = "${pkgs.lib.getLib pkgs.openssl}/lib"; 15 17 OPENSSL_INCLUDE_DIR = "${pkgs.lib.getDev pkgs.openssl}/include"; 16 - BINDGEN_EXTRA_CLANG_ARGS = pkgs.lib.concatStringsSep " " ([ 17 - "-I${pkgs.llvmPackages.libclang.lib}/lib/clang/${pkgs.lib.versions.major pkgs.llvmPackages.libclang.version}/include" 18 - ] ++ pkgs.lib.optional pkgs.stdenv.isLinux "-I${pkgs.glibc.dev}"); 18 + BINDGEN_EXTRA_CLANG_ARGS = pkgs.lib.concatStringsSep " " (["-I${pkgs.llvmPackages.libclang.lib}/lib/clang/${pkgs.lib.versions.major pkgs.llvmPackages.libclang.version}/include"] ++ pkgs.lib.optional pkgs.stdenv.isLinux "-I${pkgs.glibc.dev}"); 19 19 ZSTD_SYS_USE_PKG_CONFIG = "1"; 20 20 CC = "${pkgs.llvmPackages.clang}/bin/clang"; 21 21 CXX = "${pkgs.llvmPackages.clang}/bin/clang++"; ··· 40 40 nativeBuildInputs = nativeInputs; 41 41 buildInputs = buildInputs; 42 42 env = commonEnv; 43 + overrides = crane-overrides; 43 44 }; 44 45 45 46 members = [