lol

dosbox-staging: 0.81.1 -> 0.82.1 (#400173)

authored by

Peder Bergebakken Sundt and committed by
GitHub
3f45558b a457f732

+15 -14
+15 -14
pkgs/by-name/do/dosbox-staging/package.nix
··· 1 1 { 2 2 lib, 3 3 SDL2, 4 - SDL2_image, 5 4 SDL2_net, 6 5 alsa-lib, 7 6 fetchFromGitHub, 8 - fetchpatch, 9 7 fluidsynth, 10 8 gitUpdater, 11 9 glib, ··· 33 31 34 32 stdenv.mkDerivation (finalAttrs: { 35 33 pname = "dosbox-staging"; 36 - version = "0.81.1"; 34 + version = "0.82.1"; 35 + shortRev = "13441a2"; 37 36 38 37 src = fetchFromGitHub { 39 38 owner = "dosbox-staging"; 40 39 repo = "dosbox-staging"; 41 40 rev = "v${finalAttrs.version}"; 42 - hash = "sha256-XGssEyX+AVv7/ixgGTRtPFjsUSX0FT0fhP+TXsFl2fY="; 41 + hash = "sha256-BVeFBKqTQiEftWVvMkSYBjC6dCYI4juWD4A6Bx8E8/Y="; 43 42 }; 44 - 45 - patches = [ 46 - (fetchpatch { 47 - name = "darwin-allow-bypass-wraps.patch"; 48 - url = "https://github.com/dosbox-staging/dosbox-staging/commit/9f0fc1dc762010e5f7471d01c504d817a066cae3.patch"; 49 - hash = "sha256-IzxRE1Vr+M8I5hdy80UwebjJ5R1IlH9ymaYgs6VwAO4="; 50 - }) 51 - ]; 52 43 53 44 nativeBuildInputs = [ 54 45 gtest ··· 60 51 61 52 buildInputs = [ 62 53 SDL2 63 - SDL2_image 64 54 SDL2_net 65 55 fluidsynth 66 56 glib ··· 84 74 "man" 85 75 ]; 86 76 77 + # replace instances of the get-version.sh script that uses git in meson.build with manual values 78 + postPatch = '' 79 + substituteInPlace meson.build \ 80 + --replace-fail "meson.project_source_root() + '/scripts/get-version.sh'," "'printf'," \ 81 + --replace-fail "'version', check: true," "'${finalAttrs.version}', check: true," \ 82 + --replace-fail "'./scripts/get-version.sh', 'hash'," "'printf', '${ 83 + builtins.substring 0 5 finalAttrs.shortRev 84 + }'," 85 + ''; 86 + 87 87 postInstall = '' 88 - install -Dm644 $src/contrib/linux/dosbox-staging.desktop $out/share/applications/ 88 + install -Dm644 $src/contrib/linux/org.dosbox-staging.dosbox-staging.desktop $out/share/applications/ 89 89 ''; 90 90 91 91 # Rename binary, add a wrapper, and copy manual to avoid conflict with ··· 125 125 license = lib.licenses.gpl2Plus; 126 126 maintainers = with lib.maintainers; [ 127 127 joshuafern 128 + Zaechus 128 129 ]; 129 130 platforms = lib.platforms.unix; 130 131 priority = 101;