xemu: 0.7.135 -> 0.8.96; adopt (#418536)

authored by

Peder Bergebakken Sundt and committed by
GitHub
67e13db9 b4e691ba

+28 -12
+28 -12
pkgs/by-name/xe/xemu/package.nix
··· 6 6 gettext, 7 7 glib, 8 8 gtk3, 9 - libGLU, 9 + cmake, 10 + curl, 10 11 libdrm, 11 12 libepoxy, 12 13 libpcap, 13 14 libsamplerate, 14 15 libslirp, 15 16 libgbm, 17 + vulkan-headers, 18 + vulkan-loader, 16 19 meson, 17 20 ninja, 18 21 openssl, ··· 23 26 vte, 24 27 which, 25 28 wrapGAppsHook3, 29 + cacert, 26 30 }: 27 31 28 32 stdenv.mkDerivation (finalAttrs: { 29 33 pname = "xemu"; 30 - version = "0.7.135"; 34 + version = "0.8.96"; 31 35 32 36 src = fetchFromGitHub { 33 37 owner = "xemu-project"; 34 38 repo = "xemu"; 35 39 tag = "v${finalAttrs.version}"; 40 + hash = "sha256-42DnlnaSWVazmct9AL1/QaVqNgYe5NCMVHRJY6axo98="; 36 41 fetchSubmodules = true; 37 - hash = "sha256-lTZ5j5ULh4GFW4zlQy4l7e4zr8TEIvenGNC59O6G0Wg="; 42 + 43 + # also fetch required git submodules 44 + postFetch = '' 45 + cd "$out" 46 + export NIX_SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt 47 + 48 + ${lib.getExe meson} subprojects download \ 49 + SPIRV-Reflect VulkanMemoryAllocator berkeley-softfloat-3 berkeley-testfloat-3 genconfig glslang imgui \ 50 + implot json keycodemapdb nv2a_vsh_cpu tomlplusplus volk xxhash || true 51 + find subprojects -type d -name .git -prune -execdir rm -r {} + 52 + ''; 38 53 }; 39 54 40 55 nativeBuildInputs = [ 41 56 SDL2 42 57 meson 58 + cmake 43 59 ninja 44 60 perl 45 61 pkg-config ··· 57 73 gettext 58 74 glib 59 75 gtk3 60 - libGLU 76 + curl 61 77 libdrm 62 78 libepoxy 63 79 libpcap ··· 66 82 libgbm 67 83 openssl 68 84 vte 85 + vulkan-headers 86 + vulkan-loader 69 87 ]; 70 88 71 89 configureFlags = [ 72 90 "--disable-strip" 73 - "--meson=meson" 74 91 "--target-list=i386-softmmu" 75 92 "--disable-werror" 76 93 ]; ··· 80 97 separateDebugInfo = true; 81 98 82 99 dontUseMesonConfigure = true; 100 + dontUseCmakeConfigure = true; 83 101 84 102 setOutputFlags = false; 85 103 ··· 87 105 88 106 postPatch = '' 89 107 patchShebangs . 108 + 90 109 substituteInPlace ./scripts/xemu-version.sh \ 91 - --replace 'date -u' "date -d @$SOURCE_DATE_EPOCH '+%Y-%m-%d %H:%M:%S'" 110 + --replace-fail 'date -u' "date -d @$SOURCE_DATE_EPOCH '+%Y-%m-%d %H:%M:%S'" 92 111 ''; 93 112 94 113 preConfigure = '' 95 114 configureFlagsArray+=("--extra-cflags=-DXBOX=1 -Wno-error=redundant-decls") 96 - '' 97 - + 98 115 # When the data below can't be obtained through git, the build process tries 99 116 # to run `XEMU_COMMIT=$(cat XEMU_COMMIT)` (and similar) 100 - '' 101 - echo '${finalAttrs.version}' > XEMU_VERSION 102 - ''; 117 + echo '${finalAttrs.version}' > XEMU_VERSION 118 + ''; 103 119 104 120 preBuild = '' 105 121 cd build ··· 145 161 changelog = "https://github.com/xemu-project/xemu/releases/tag/v${finalAttrs.version}"; 146 162 license = lib.licenses.gpl2Plus; 147 163 mainProgram = "xemu"; 148 - maintainers = with lib.maintainers; [ ]; 164 + maintainers = with lib.maintainers; [ marcin-serwin ]; 149 165 platforms = lib.platforms.linux; 150 166 }; 151 167 })