From ebe61cdf1f3be12630b2b6af4c84bc1943fcb7ec Mon Sep 17 00:00:00 2001 From: Alexis Praga Date: Mon, 10 Feb 2025 23:56:52 +0100 Subject: [PATCH] kent: fix for non-x86_64 cpus. --- pkgs/by-name/ke/kent/package.nix | 8 ++++---- pkgs/development/perl-modules/Bio-Ext-Align/default.nix | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ke/kent/package.nix b/pkgs/by-name/ke/kent/package.nix index d7e8abd22b84..2c9d41ff6d27 100644 --- a/pkgs/by-name/ke/kent/package.nix +++ b/pkgs/by-name/ke/kent/package.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { export HOME=$TMPDIR export DESTBINDIR=$HOME/bin - mkdir -p $HOME/lib $HOME/bin/x86_64 + mkdir -p $HOME/lib $HOME/bin/${stdenv.hostPlatform.parsed.cpu.name} cd ./src chmod +x ./checkUmask.sh @@ -63,8 +63,8 @@ stdenv.mkDerivation rec { cd jkOwnLib make - cp ../lib/x86_64/jkOwnLib.a $HOME/lib - cp ../lib/x86_64/jkweb.a $HOME/lib + cp ../lib/${stdenv.hostPlatform.parsed.cpu.name}/jkOwnLib.a $HOME/lib + cp ../lib/${stdenv.hostPlatform.parsed.cpu.name}/jkweb.a $HOME/lib cp -r ../inc $HOME/ cd ../utils @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin $out/lib $out/inc cp $HOME/lib/jkOwnLib.a $out/lib cp $HOME/lib/jkweb.a $out/lib - cp $HOME/bin/x86_64/* $out/bin + cp $HOME/bin/${stdenv.hostPlatform.parsed.cpu.name}/* $out/bin cp -r $HOME/inc/* $out/inc/ runHook postInstall diff --git a/pkgs/development/perl-modules/Bio-Ext-Align/default.nix b/pkgs/development/perl-modules/Bio-Ext-Align/default.nix index 2bbb36e2ad25..936148bc1ce8 100644 --- a/pkgs/development/perl-modules/Bio-Ext-Align/default.nix +++ b/pkgs/development/perl-modules/Bio-Ext-Align/default.nix @@ -35,7 +35,6 @@ buildPerlPackage rec { # Disable tests as it requires Bio::Tools::Align which is in a different directory buildPhase = '' make - ''; checkPhase = ''