mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-20 08:59:32 +03:00
Merge pull request #203377 from wegank/desmume-aarch64-linux
desmume: unbreak on aarch64-linux
This commit is contained in:
commit
02973674f3
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, SDL2
|
||||
, agg
|
||||
, alsa-lib
|
||||
@ -32,6 +33,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-vmjKXa/iXLTwtqnG+ZUvOnOQPZROeMpfM5J3Jh/Ynfo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix compiling on GCC for AArch64
|
||||
(fetchpatch {
|
||||
url = "https://github.com/TASEmulators/desmume/commit/24eb5ed95c6cbdaba8b3c63a99e95e899e8a5061.patch";
|
||||
hash = "sha256-J3ZRU1tPTl+4/jg0DBo6ro6DTUZkpQCey+QGF2EugCQ=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
desktop-file-utils
|
||||
intltool
|
||||
@ -81,8 +90,5 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = [ maintainers.AndersonTorres ];
|
||||
platforms = platforms.unix;
|
||||
broken = stdenv.isAarch64 && stdenv.isLinux; # ofborg failed
|
||||
};
|
||||
})
|
||||
# TODO: investigate the patches
|
||||
# TODO: investigate other platforms
|
||||
|
Loading…
Reference in New Issue
Block a user