Merge pull request #257804 from thiagokokada/geekbench-support-aarch64

geekbench_6: 6.1.0 -> 6.2.0; geekbench_{5,6}: add support for aarch64-linux

authored by

Thiago Kenji Okada and committed by
GitHub
d24e5c4c 82f7c281

+41 -18
+20 -9
pkgs/tools/misc/geekbench/5.nix
··· 8 8 , vulkan-loader 9 9 }: 10 10 11 - stdenv.mkDerivation rec { 11 + let 12 + inherit (stdenv.hostPlatform.uname) processor; 13 + version = "5.5.1"; 14 + sources = { 15 + "x86_64-linux" = { 16 + url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz"; 17 + hash = "sha256-MgN+VcPcjzYP4Wt/uxiNMTh+p1mA5I2M8CgzDjI5xAQ="; 18 + }; 19 + "aarch64-linux" = { 20 + url = "https://cdn.geekbench.com/Geekbench-${version}-LinuxARMPreview.tar.gz"; 21 + hash = "sha256-nrPKnsMqvw6+HGQAKxkQi/6lPEEca1VrDCaJUUuMvW8="; 22 + }; 23 + }; 24 + in 25 + stdenv.mkDerivation { 26 + inherit version; 12 27 pname = "geekbench"; 13 - version = "5.5.1"; 14 28 15 - src = fetchurl { 16 - url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz"; 17 - sha256 = "sha256-MgN+VcPcjzYP4Wt/uxiNMTh+p1mA5I2M8CgzDjI5xAQ="; 18 - }; 29 + src = fetchurl (sources.${stdenv.system}); 19 30 20 31 dontConfigure = true; 21 32 dontBuild = true; ··· 28 39 runHook preInstall 29 40 30 41 mkdir -p $out/bin 31 - cp -r geekbench.plar geekbench5 geekbench_x86_64 $out/bin 42 + cp -r geekbench.plar geekbench5 geekbench_${processor} $out/bin 32 43 33 - for f in geekbench5 geekbench_x86_64 ; do 44 + for f in geekbench5 geekbench_${processor} ; do 34 45 wrapProgram $out/bin/$f \ 35 46 --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ 36 47 addOpenGLRunpath.driverLink ··· 48 59 sourceProvenance = with sourceTypes; [ binaryNativeCode ]; 49 60 license = licenses.unfree; 50 61 maintainers = [ maintainers.michalrus ]; 51 - platforms = [ "x86_64-linux" ]; 62 + platforms = builtins.attrNames sources; 52 63 mainProgram = "geekbench5"; 53 64 }; 54 65 }
+21 -9
pkgs/tools/misc/geekbench/6.nix
··· 8 8 , vulkan-loader 9 9 }: 10 10 11 - stdenv.mkDerivation rec { 11 + let 12 + inherit (stdenv.hostPlatform.uname) processor; 13 + version = "6.2.0"; 14 + sources = { 15 + "x86_64-linux" = { 16 + url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz"; 17 + hash = "sha256-QoxSw825qqx1vzhzW9TZg03BPNvgOCokBWARGUhjCGY="; 18 + }; 19 + "aarch64-linux" = { 20 + url = "https://cdn.geekbench.com/Geekbench-${version}-LinuxARMPreview.tar.gz"; 21 + hash = "sha256-m2uz5Rk34rm9Bx3j5FjFigOIKaj2c4I+uXKzU4cK4D4="; 22 + }; 23 + }; 24 + geekbench_avx2 = lib.optionalString stdenv.isx86_64 "geekbench_avx2"; 25 + in 26 + stdenv.mkDerivation { 27 + inherit version; 12 28 pname = "geekbench"; 13 - version = "6.1.0"; 14 29 15 - src = fetchurl { 16 - url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz"; 17 - hash = "sha256-GBJHnT6tfLdZuaawwhEvqOFYcmM42DZxRxm7cJNi0aA="; 18 - }; 30 + src = fetchurl (sources.${stdenv.system}); 19 31 20 32 dontConfigure = true; 21 33 dontBuild = true; ··· 28 40 runHook preInstall 29 41 30 42 mkdir -p $out/bin 31 - cp -r geekbench.plar geekbench-workload.plar geekbench6 geekbench_x86_64 geekbench_avx2 $out/bin 43 + cp -r geekbench.plar geekbench-workload.plar geekbench6 geekbench_${processor} ${geekbench_avx2} $out/bin 32 44 33 - for f in geekbench6 geekbench_x86_64 geekbench_avx2 ; do 45 + for f in geekbench6 geekbench_${processor} ${geekbench_avx2} ; do 34 46 wrapProgram $out/bin/$f \ 35 47 --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ 36 48 addOpenGLRunpath.driverLink ··· 48 60 sourceProvenance = with sourceTypes; [ binaryNativeCode ]; 49 61 license = licenses.unfree; 50 62 maintainers = [ maintainers.michalrus ]; 51 - platforms = [ "x86_64-linux" ]; 63 + platforms = builtins.attrNames sources; 52 64 mainProgram = "geekbench6"; 53 65 }; 54 66 }