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
This commit is contained in:
Thiago Kenji Okada
2023-09-28 21:07:36 +01:00
committed by GitHub
2 changed files with 42 additions and 19 deletions
+20 -9
View File
@@ -8,14 +8,25 @@
, vulkan-loader
}:
stdenv.mkDerivation rec {
pname = "geekbench";
let
inherit (stdenv.hostPlatform.uname) processor;
version = "5.5.1";
src = fetchurl {
url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz";
sha256 = "sha256-MgN+VcPcjzYP4Wt/uxiNMTh+p1mA5I2M8CgzDjI5xAQ=";
sources = {
"x86_64-linux" = {
url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz";
hash = "sha256-MgN+VcPcjzYP4Wt/uxiNMTh+p1mA5I2M8CgzDjI5xAQ=";
};
"aarch64-linux" = {
url = "https://cdn.geekbench.com/Geekbench-${version}-LinuxARMPreview.tar.gz";
hash = "sha256-nrPKnsMqvw6+HGQAKxkQi/6lPEEca1VrDCaJUUuMvW8=";
};
};
in
stdenv.mkDerivation {
inherit version;
pname = "geekbench";
src = fetchurl (sources.${stdenv.system});
dontConfigure = true;
dontBuild = true;
@@ -28,9 +39,9 @@ stdenv.mkDerivation rec {
runHook preInstall
mkdir -p $out/bin
cp -r geekbench.plar geekbench5 geekbench_x86_64 $out/bin
cp -r geekbench.plar geekbench5 geekbench_${processor} $out/bin
for f in geekbench5 geekbench_x86_64 ; do
for f in geekbench5 geekbench_${processor} ; do
wrapProgram $out/bin/$f \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [
addOpenGLRunpath.driverLink
@@ -48,7 +59,7 @@ stdenv.mkDerivation rec {
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
maintainers = [ maintainers.michalrus ];
platforms = [ "x86_64-linux" ];
platforms = builtins.attrNames sources;
mainProgram = "geekbench5";
};
}
+22 -10
View File
@@ -8,14 +8,26 @@
, vulkan-loader
}:
stdenv.mkDerivation rec {
pname = "geekbench";
version = "6.1.0";
src = fetchurl {
url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz";
hash = "sha256-GBJHnT6tfLdZuaawwhEvqOFYcmM42DZxRxm7cJNi0aA=";
let
inherit (stdenv.hostPlatform.uname) processor;
version = "6.2.0";
sources = {
"x86_64-linux" = {
url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz";
hash = "sha256-QoxSw825qqx1vzhzW9TZg03BPNvgOCokBWARGUhjCGY=";
};
"aarch64-linux" = {
url = "https://cdn.geekbench.com/Geekbench-${version}-LinuxARMPreview.tar.gz";
hash = "sha256-m2uz5Rk34rm9Bx3j5FjFigOIKaj2c4I+uXKzU4cK4D4=";
};
};
geekbench_avx2 = lib.optionalString stdenv.isx86_64 "geekbench_avx2";
in
stdenv.mkDerivation {
inherit version;
pname = "geekbench";
src = fetchurl (sources.${stdenv.system});
dontConfigure = true;
dontBuild = true;
@@ -28,9 +40,9 @@ stdenv.mkDerivation rec {
runHook preInstall
mkdir -p $out/bin
cp -r geekbench.plar geekbench-workload.plar geekbench6 geekbench_x86_64 geekbench_avx2 $out/bin
cp -r geekbench.plar geekbench-workload.plar geekbench6 geekbench_${processor} ${geekbench_avx2} $out/bin
for f in geekbench6 geekbench_x86_64 geekbench_avx2 ; do
for f in geekbench6 geekbench_${processor} ${geekbench_avx2} ; do
wrapProgram $out/bin/$f \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [
addOpenGLRunpath.driverLink
@@ -48,7 +60,7 @@ stdenv.mkDerivation rec {
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
maintainers = [ maintainers.michalrus ];
platforms = [ "x86_64-linux" ];
platforms = builtins.attrNames sources;
mainProgram = "geekbench6";
};
}