gxemul: 0.6.2 -> 0.7.0

+53 -15
+26
pkgs/misc/emulators/gxemul/0001-fix-attributes.patch
··· 1 + diff -Naur gxemul-0.7.0-old/src/include/thirdparty/pcireg.h gxemul-0.7.0/src/include/thirdparty/pcireg.h 2 + --- gxemul-0.7.0-old/src/include/thirdparty/pcireg.h 2021-04-22 15:04:14.000000000 -0300 3 + +++ gxemul-0.7.0-new/src/include/thirdparty/pcireg.h 2021-06-28 18:41:13.063065322 -0300 4 + @@ -12,9 +12,6 @@ 5 + #undef __noreturn__ 6 + #endif 7 + 8 + -#define __attribute__(x) /* */ 9 + -#define __noreturn__ /* */ 10 + - 11 + /* 12 + * Copyright (c) 1995, 1996, 1999, 2000 13 + * Christopher G. Demetriou. All rights reserved. 14 + diff -Naur gxemul-0.7.0-old/src/include/thirdparty/sgi_arcbios.h gxemul-0.7.0/src/include/thirdparty/sgi_arcbios.h 15 + --- gxemul-0.7.0-old/src/include/thirdparty/sgi_arcbios.h 2021-04-22 15:04:14.000000000 -0300 16 + +++ gxemul-0.7.0-new/src/include/thirdparty/sgi_arcbios.h 2021-06-28 18:41:33.549981505 -0300 17 + @@ -14,9 +14,6 @@ 18 + #undef __noreturn__ 19 + #endif 20 + 21 + -#define __attribute__(x) /* */ 22 + -#define __noreturn__ /* */ 23 + - 24 + /* $NetBSD: arcbios.h,v 1.3 2001/12/06 14:59:02 rafal Exp $ */ 25 + 26 + /*-
+27 -15
pkgs/misc/emulators/gxemul/default.nix
··· 1 - { lib, stdenv, fetchurl }: 1 + { lib 2 + , stdenv 3 + , fetchurl 4 + , libX11 5 + }: 2 6 3 7 stdenv.mkDerivation rec { 4 8 pname = "gxemul"; 5 - version = "0.6.2"; 9 + version = "0.7.0"; 6 10 7 11 src = fetchurl { 8 - url = "http://gavare.se/gxemul/src/gxemul-${version}.tar.gz"; 9 - sha256 = "0iqmazfn7ss5n27m1a9n9nps3vzhag1phzb7qw0wgczycmwsq0x7"; 12 + url = "http://gavare.se/gxemul/src/${pname}-${version}.tar.gz"; 13 + sha256 = "sha256-ecRDfG+MqQT0bTOsNgYqZf3PSpKiSEeOQIqxEpXPjoM="; 10 14 }; 11 15 12 - configurePhase = "./configure"; 16 + buildInputs = [ 17 + libX11 18 + ]; 13 19 14 - installPhase = '' 15 - mkdir -p {$out/bin,$out/share/${pname}-${version}} 16 - cp -r {doc,demos} $out/share/${pname}-${version} 17 - cp gxemul $out/bin 18 - cp -r ./man $out 20 + patches = [ 21 + # Fix compilation; remove when next release arrives 22 + ./0001-fix-attributes.patch 23 + ]; 24 + 25 + dontAddPrefix = true; 26 + 27 + preConfigure = '' 28 + export PREFIX=${placeholder "out"} 19 29 ''; 20 30 21 31 meta = with lib; { ··· 24 34 longDescription = '' 25 35 GXemul is a framework for full-system computer architecture 26 36 emulation. Several real machines have been implemented within the 27 - framework, consisting of processors (ARM, MIPS, Motorola 88K, 28 - PowerPC, and SuperH) and surrounding hardware components such as 29 - framebuffers, interrupt controllers, busses, disk controllers, 30 - and serial controllers. The emulation is working well enough to 31 - allow several unmodified "guest" operating systems to run. 37 + framework, consisting of processors (ARM, MIPS, Motorola 88K, PowerPC, and 38 + SuperH) and surrounding hardware components such as framebuffers, 39 + interrupt controllers, busses, disk controllers, and serial 40 + controllers. The emulation is working well enough to allow several 41 + unmodified "guest" operating systems to run. 32 42 ''; 33 43 license = licenses.bsd3; 44 + maintainers = with maintainers; [ AndersonTorres ]; 45 + platforms = platforms.unix; 34 46 }; 35 47 }