movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-10 03:23:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

xa: 2.3.14 -> 2.4.1 (#414646)

Browse source
This commit is contained in:
Peder Bergebakken Sundt 2025-06-08 16:47:42 +02:00 • committed by GitHub
commit 3aebc02863
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 22 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pkgs/by-name/qm/qmplay2/package.nix
View file

@ -1,5 +1,6 @@
{ {
lib, lib,
stdenv,
alsa-lib, alsa-lib,
callPackage, callPackage,
cmake, cmake,
@ -19,7 +20,6 @@
pkg-config, pkg-config,
qt5, qt5,
qt6, qt6,
stdenv,
taglib, taglib,
vulkan-headers, vulkan-headers,
vulkan-tools, vulkan-tools,
@ -43,6 +43,8 @@ stdenv.mkDerivation (finalAttrs: {
cp -va ${sources.qmvk.src}/* qmvk/ cp -va ${sources.qmvk.src}/* qmvk/
chmod --recursive 744 qmvk chmod --recursive 744 qmvk
popd popd
substituteInPlace src/qmplay2/vulkan/VulkanWindow.cpp \
--replace-fail "getSubmitInfo()" "getSubmitInfo(0)"
''; '';
nativeBuildInputs = nativeBuildInputs =

13
pkgs/by-name/qm/qmplay2/sources.nix
View file

@ -5,13 +5,14 @@
let let
self = { self = {
pname = "qmplay2"; pname = "qmplay2";
version = "24.06.16"; version = "25.01.19";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zaps166"; owner = "zaps166";
repo = "QMPlay2"; repo = "QMPlay2";
rev = self.version; tag = self.version;
hash = "sha256-HoFyC/OFmthUYfyo6//+KmBIq06MPb5GmDekJbnsz5o="; hash = "sha256-Of/zEQ6o2J/wXfAoY10IPtCaMaSk8ux8L6MrimeMWVA=";
fetchSubmodules = true;
}; };
}; };
in in
@ -19,13 +20,13 @@
qmvk = { qmvk = {
pname = "qmvk"; pname = "qmvk";
version = "0-unstable-2024-04-19"; version = "0-unstable-2025-06-05";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zaps166"; owner = "zaps166";
repo = "QmVk"; repo = "QmVk";
rev = "5c5c2942255820b6343afdfeea0405cd3b36870e"; rev = "754e6ca4b65433cb500a797e86d48d899d5a41c2";
hash = "sha256-viFM9N5PiSCgkGlxtrLFCVDIML/QyPiaPRX77RW2NNw="; hash = "sha256-t4fGIfZhZE8ShQGa1zMJLpnvCEfCdCeAWOKwF4+nFSw=";
}; };
}; };
} }

24
pkgs/by-name/xa/xa/package.nix
View file

@ -7,14 +7,14 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "xa"; pname = "xa";
version = "2.3.14"; version = "2.4.1";
src = fetchurl { src = fetchurl {
urls = [ urls = [
"https://www.floodgap.com/retrotech/xa/dists/xa-${finalAttrs.version}.tar.gz" "https://www.floodgap.com/retrotech/xa/dists/xa-${finalAttrs.version}.tar.gz"
"https://www.floodgap.com/retrotech/xa/dists/unsupported/xa-${finalAttrs.version}.tar.gz" "https://www.floodgap.com/retrotech/xa/dists/unsupported/xa-${finalAttrs.version}.tar.gz"
]; ];
hash = "sha256-G5u6vdvY07lBC4UuUKEo7qQeaBM55vdsPoB2+lQg8C4="; hash = "sha256-Y8EqajKo42TzTwSdiyR39GVgIUGPCLjWtGK+DtO+OsM=";
}; };
nativeCheckInputs = [ perl ]; nativeCheckInputs = [ perl ];
@ -23,19 +23,18 @@ stdenv.mkDerivation (finalAttrs: {
postPatch = '' postPatch = ''
substituteInPlace Makefile \ substituteInPlace Makefile \
--replace "CC = gcc" "CC = ${stdenv.cc.targetPrefix}cc" \ --replace-fail "CC = gcc" "CC = ${stdenv.cc.targetPrefix}cc" \
--replace "LD = gcc" "LD = ${stdenv.cc.targetPrefix}cc" \ --replace-fail "LD = gcc" "LD = ${stdenv.cc.targetPrefix}cc" \
--replace "CFLAGS = -O2" "CFLAGS ?=" \ --replace-fail "CFLAGS = -O2" "CFLAGS ?=" \
--replace "LDFLAGS = -lc" "LDFLAGS ?= -lc" --replace-fail "LDFLAGS = -lc" "LDFLAGS ?= -lc" \
--replace-fail "install: all" "install:"
''; '';
makeFlags = [ makeFlags = [ "DESTDIR:=${placeholder "out"}" ];
"DESTDIR:=${placeholder "out"}"
];
enableParallelBuilding = true; enableParallelBuilding = true;
doCheck = true; doCheck = false; # while opening file: stat: No such file or directory [Makefile:21: test1.o65]
# Running tests in parallel does not work # Running tests in parallel does not work
enableParallelChecking = false; enableParallelChecking = false;
@ -63,8 +62,9 @@ stdenv.mkDerivation (finalAttrs: {
suite, as well as "bare" plain binary object files suite, as well as "bare" plain binary object files
- block structure for label scoping - block structure for label scoping
''; '';
mainProgram = "xa";
license = lib.licenses.gpl2Plus; license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ ]; maintainers = [ ];
platforms = with lib.platforms; unix; platforms = lib.platforms.unix;
}; };
}) })