diff options
author | Sergei Trofimovich <slyich@gmail.com> | 2021-11-13 09:07:22 +0000 |
---|---|---|
committer | Sergei Trofimovich <slyich@gmail.com> | 2021-11-13 09:07:52 +0000 |
commit | b1f8e1634f9f0c913aa37b1d8c8c95b2bf950fad (patch) | |
tree | 8616389ca3ff47b833d7c5b0b7d9c118a2d33291 /pkgs/applications/audio/libopenmpt | |
parent | 679a57d577ea3c5a254ef6858e63e310b43c069f (diff) | |
download | nixpkgs-b1f8e1634f9f0c913aa37b1d8c8c95b2bf950fad.tar nixpkgs-b1f8e1634f9f0c913aa37b1d8c8c95b2bf950fad.tar.gz nixpkgs-b1f8e1634f9f0c913aa37b1d8c8c95b2bf950fad.tar.bz2 nixpkgs-b1f8e1634f9f0c913aa37b1d8c8c95b2bf950fad.tar.lz nixpkgs-b1f8e1634f9f0c913aa37b1d8c8c95b2bf950fad.tar.xz nixpkgs-b1f8e1634f9f0c913aa37b1d8c8c95b2bf950fad.tar.zst nixpkgs-b1f8e1634f9f0c913aa37b1d8c8c95b2bf950fad.zip |
libopenmpt: fix build on gcc-12
`gcc-12` cleaned up implicit header includes and now requires explicit '<memory>' for 'std::unique_ptr<>': openmpt123/openmpt123.cpp:194:14: error: 'unique_ptr' in namespace 'std' does not name a template type 194 | std::unique_ptr<file_audio_stream_base> impl; | ^~~~~~~~~~ openmpt123/openmpt123.cpp:109:1: note: 'std::unique_ptr' is defined in header '<memory>'; did you forget to '#include <memory>'? 108 | #include "openmpt123_waveout.hpp" +++ |+#include <memory> 109 |
Diffstat (limited to 'pkgs/applications/audio/libopenmpt')
-rw-r--r-- | pkgs/applications/audio/libopenmpt/default.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/applications/audio/libopenmpt/default.nix b/pkgs/applications/audio/libopenmpt/default.nix index ef5c080133b..b2b5ebecd7e 100644 --- a/pkgs/applications/audio/libopenmpt/default.nix +++ b/pkgs/applications/audio/libopenmpt/default.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, fetchurl, zlib, pkg-config, mpg123, libogg, libvorbis, portaudio, libsndfile, flac +{ config, lib, stdenv, fetchurl, fetchpatch, zlib, pkg-config, mpg123, libogg, libvorbis, portaudio, libsndfile, flac , usePulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio }: stdenv.mkDerivation rec { @@ -12,6 +12,16 @@ stdenv.mkDerivation rec { sha256 = "1c54lldr2imjzhlhq5lvwhj7d5794xm97cby9pznr5wdjjay0sa4"; }; + patches = [ + # Fix pending upstream inclusion for gcc-12 include headers: + # https://github.com/OpenMPT/openmpt/pull/8 + (fetchpatch { + name = "gcc-12.patch"; + url = "https://github.com/OpenMPT/openmpt/commit/6e7a43190ef2f9ba0b3efc19b9527261b69ec8f7.patch"; + sha256 = "081m1rf09bbrlg52aihaajmld5dcnwbp6y7zpyik92mm332r330h"; + }) + ]; + enableParallelBuilding = true; nativeBuildInputs = [ pkg-config ]; |