summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOPNA2608 <christoph.neidahl@gmail.com>2023-05-25 10:29:18 +0200
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2023-05-29 18:20:05 +0000
commit5991c8c8795488597ace06e4c36a77383b22a924 (patch)
treee8c4a5ebb72d7b1d7cbec60fdead5faa6c7df8cd
parentMerge pull request #234052 from NixOS/backport-231630-to-release-23.05 (diff)
downloadnixpkgs-origin/backport-233947-to-release-23.05.tar.gz
furnace: 0.6pre4-hotfix -> 0.6pre5origin/backport-233947-to-release-23.05
(cherry picked from commit d200470be831e4c99609a19b3d1ab97cfa260025)
-rw-r--r--pkgs/applications/audio/furnace/default.nix13
1 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/applications/audio/furnace/default.nix b/pkgs/applications/audio/furnace/default.nix
index 372a873ca580..d916e68292e2 100644
--- a/pkgs/applications/audio/furnace/default.nix
+++ b/pkgs/applications/audio/furnace/default.nix
@@ -10,6 +10,7 @@
, fftw
, fmt_8
, libsndfile
+, libX11
, rtmidi
, SDL2
, zlib
@@ -21,16 +22,23 @@
stdenv.mkDerivation rec {
pname = "furnace";
- version = "0.6pre4-hotfix";
+ version = "0.6pre5";
src = fetchFromGitHub {
owner = "tildearrow";
repo = "furnace";
rev = "v${version}";
fetchSubmodules = true;
- sha256 = "sha256-lJtV/0GnWN5mSjv2LaPEMnkuThaNeijBMjLGFPOJX4k=";
+ sha256 = "sha256-6KiG7nfQUdPW+EkBW3PPM141kOmolAgrrqhEGH/Azg4=";
};
+ postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
+ # To offer scaling detection on X11, furnace checks if libX11.so is available via dlopen and uses some of its functions
+ # But it's being linked against a versioned libX11.so.VERSION via SDL, so the unversioned one is not on the rpath
+ substituteInPlace src/gui/scaling.cpp \
+ --replace 'libX11.so' '${lib.getLib libX11}/lib/libX11.so'
+ '';
+
nativeBuildInputs = [
cmake
pkg-config
@@ -97,6 +105,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Multi-system chiptune tracker compatible with DefleMask modules";
homepage = "https://github.com/tildearrow/furnace";
+ changelog = "https://github.com/tildearrow/furnace/releases/tag/v${version}";
license = with licenses; [ gpl2Plus ];
maintainers = with maintainers; [ OPNA2608 ];
platforms = platforms.all;