Merge #261285: chromium: delete unused paths in source tarball

+27 -5
+23 -1
pkgs/applications/networking/browsers/chromium/common.nix
··· 1 1 { stdenv, lib, fetchurl, fetchpatch 2 + , fetchzip, zstd 2 3 , buildPackages 3 4 , pkgsBuildBuild 4 5 , pkgsBuildTarget ··· 152 153 inherit (upstream-info) version; 153 154 inherit packageName buildType buildPath; 154 155 155 - src = fetchurl { 156 + src = fetchzip { 157 + name = "chromium-${version}.tar.zstd"; 156 158 url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz"; 157 159 inherit (upstream-info) sha256; 160 + 161 + nativeBuildInputs = [ zstd ]; 162 + 163 + postFetch = '' 164 + echo removing unused code from tarball to stay under hydra limit 165 + rm -r $out/third_party/{rust-src,llvm} 166 + 167 + echo moving remains out of \$out 168 + mv $out source 169 + 170 + echo recompressing final contents into new tarball 171 + # try to make a deterministic tarball 172 + tar \ 173 + --use-compress-program "zstd -T$NIX_BUILD_CORES" \ 174 + --sort name \ 175 + --mtime 1970-01-01 \ 176 + --owner=root --group=root \ 177 + --numeric-owner --mode=go=rX,u+rw,a-s \ 178 + -cf $out source 179 + ''; 158 180 }; 159 181 160 182 nativeBuildInputs = [
+4 -4
pkgs/applications/networking/browsers/chromium/upstream-info.nix
··· 8 8 version = "2023-08-01"; 9 9 }; 10 10 }; 11 - sha256 = "1wf0j189cxpayy6ffmj5j6h5yg3amivryilimjc2ap0jkyj4xrbi"; 11 + sha256 = "0c3adrrgpnhm8g1546ask9pf17qj1sjgb950mj0rv4snxvddi75j"; 12 12 sha256bin64 = "11w1di146mjb9ql30df9yk9x4b9amc6514jzyfbf09mqsrw88dvr"; 13 13 version = "117.0.5938.22"; 14 14 }; ··· 21 21 version = "2023-08-10"; 22 22 }; 23 23 }; 24 - sha256 = "1z01b6w4sgndrlcd26jgimk3rhv3wzpn67nv1fd5ln7dwfwkyq20"; 24 + sha256 = "16dq27lsywrn2xlgr5g46gdv15p30sihfamli4vkv3zxzfxdjisv"; 25 25 sha256bin64 = "11y09hsy7y1vg65xfilq44ffsmn15dqy80fa57psj1kin4a52v2x"; 26 26 version = "118.0.5966.0"; 27 27 }; ··· 41 41 version = "2023-08-10"; 42 42 }; 43 43 }; 44 - sha256 = "0gcrnvm3ar7x0fv38kjvdzgb8lflx1sckcqy89yawgfy6jkh1vj9"; 44 + sha256 = "1g8rllmnmhmmpjzrmi3cww0nszxicq0kim2wd0l0ip2mzk2p8qlp"; 45 45 sha256bin64 = "1bq170l0g9yq17x6xlg6fjar6gv3hdi0zijwmx4s02pmw6727484"; 46 46 version = "118.0.5993.70"; 47 47 }; ··· 58 58 sha256 = "0k6684cy1ks6yba2bdz17g244f05qy9769cvis4h2jzhgbf5rysh"; 59 59 }; 60 60 }; 61 - sha256 = "0gcrnvm3ar7x0fv38kjvdzgb8lflx1sckcqy89yawgfy6jkh1vj9"; 61 + sha256 = "1g8rllmnmhmmpjzrmi3cww0nszxicq0kim2wd0l0ip2mzk2p8qlp"; 62 62 sha256bin64 = "1bq170l0g9yq17x6xlg6fjar6gv3hdi0zijwmx4s02pmw6727484"; 63 63 version = "118.0.5993.70"; 64 64 };