ATproto Nix User Repo

fix tar command

Changed files
+17 -21
overlays
pkgs
microcosm
+17 -11
overlays/cfg-if-fix.nix
··· 1 1 final: prev: { 2 - buildPackage = args: 2 + vendorCargoDeps = args: 3 3 let 4 - pname = args.pname or ""; 4 + previousOverride = args.overrideVendorCargoPackage or (_pkg: drv: drv); 5 + newOverride = pkg: drv: 6 + let 7 + drv' = if pkg.name == "cfg-if" then 8 + drv.overrideAttrs (old: { 9 + unpackPhase = '' 10 + tar -xzf $src --no-same-owner 11 + ''; 12 + requiredSystemFeatures = [ "local-build" ]; 13 + }) 14 + else 15 + drv; 16 + in 17 + previousOverride pkg drv'; 5 18 in 6 - prev.buildPackage (args // ( 7 - if pname == "cfg-if" && args.version == "1.0.0" then { 8 - requiredSystemFeatures = [ "local-build" ]; 9 - unpackPhase = '' 10 - tar -xzf $src --no-same-owner 11 - ''; 12 - } else { } 13 - )); 14 - } 19 + prev.vendorCargoDeps (args // { overrideVendorCargoPackage = newOverride; }); 20 + }
-10
pkgs/microcosm/default.nix
··· 37 37 nativeBuildInputs = nativeInputs; 38 38 buildInputs = buildInputs; 39 39 env = commonEnv; 40 - overrideVendorCargoPackage = pkg: drv: 41 - if pkg.name == "cfg-if" then 42 - drv.overrideAttrs (old: { 43 - unpackPhase = '' 44 - tar -xzf $src --no-same-owner 45 - ''; 46 - requiredSystemFeatures = [ "local-build" ]; 47 - }) 48 - else 49 - drv; 50 40 }; 51 41 52 42 members = [