File tree Expand file tree Collapse file tree 1 file changed +14
-18
lines changed Expand file tree Collapse file tree 1 file changed +14
-18
lines changed Original file line number Diff line number Diff line change 11{
22 lib ,
3- stdenv ,
3+ gcc13Stdenv ,
44 fetchFromGitHub ,
5- fetchpatch ,
65 testers ,
76 uasm ,
87} :
98
9+ let
10+ stdenv = gcc13Stdenv ;
11+ in
1012stdenv . mkDerivation rec {
1113 pname = "uasm" ;
12- version = "2.56.2 " ;
14+ version = "2.57 " ;
1315
1416 src = fetchFromGitHub {
1517 owner = "Terraspace" ;
16- repo = pname ;
17- # Specifying only the tag results in the following error during download:
18- # the given path has multiple possibilities: #<Git::Ref:0x00007f618689c378>, #<Git::Ref:0x00007f618689c1e8>
19- # Probably because upstream has both a tag and a branch with the same name
20- rev = "refs/tags/v${ version } " ;
21- hash = "sha256-QiRBscY6zefeLDDVhS/+j9yIJ+5QhgkDQh1CLl/CslM=" ;
18+ repo = "uasm" ;
19+ tag = "v${ version } r" ;
20+ hash = "sha256-HaiK2ogE71zwgfhWL7fesMrNZYnh8TV/kE3ZIS0l85w=" ;
2221 } ;
2322
24- patches = [
25- ( fetchpatch {
26- name = "fix-v2_55-compilation-on-macos.patch" ;
27- url = "https://github.com/Terraspace/UASM/commit/b50c430cc3083c7f32e288a9f64fe1cafb03091d.patch" ;
28- sha256 = "sha256-FGFB282LSEKtGD1cIRH+Qi5bye5Gx4xb0Ty4J03xjCU" ;
29- } )
30- ] ;
31-
3223 enableParallelBuilding = true ;
3324
34- makefile = if stdenv . hostPlatform . isDarwin then "ClangOSX64.mak" else "gccLinux64.mak" ;
25+ makefile =
26+ if gcc13Stdenv . hostPlatform . isDarwin then
27+ "Makefile-OSX-Clang-64.mak"
28+ else
29+ "Makefile-Linux-GCC-64.mak" ;
3530
3631 makeFlags = [ "CC=${ stdenv . cc . targetPrefix } cc" ] ;
3732
@@ -57,5 +52,6 @@ stdenv.mkDerivation rec {
5752 platforms = platforms . unix ;
5853 maintainers = with maintainers ; [ thiagokokada ] ;
5954 license = licenses . watcom ;
55+ broken = stdenv . isDarwin ;
6056 } ;
6157}
You can’t perform that action at this time.
0 commit comments