mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-16 06:47:09 +03:00
Merge pull request #122915 from polygon/caprice32
caprice32: Add <string> include
This commit is contained in:
commit
f1852527a9
@ -5,6 +5,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
pname = "caprice32";
|
||||
version = "4.6.0";
|
||||
# NOTE: When bumping version beyond 4.6.0, you likely need to remove
|
||||
# string.patch below. The fix of this patch has already been
|
||||
# done upstream but is not yet part of a release
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "caprice32";
|
||||
@ -16,6 +19,8 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ desktop-file-utils pkg-config ];
|
||||
buildInputs = [ libpng SDL freetype zlib ];
|
||||
|
||||
patches = [ ./string.patch ];
|
||||
|
||||
makeFlags = [
|
||||
"APP_PATH=${placeholder "out"}/share/caprice32"
|
||||
"RELEASE=1"
|
||||
|
12
pkgs/misc/emulators/caprice32/string.patch
Normal file
12
pkgs/misc/emulators/caprice32/string.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff --git a/src/configuration.h b/src/configuration.h
|
||||
index 34fd690..97fb0e5 100644
|
||||
--- a/src/configuration.h
|
||||
+++ b/src/configuration.h
|
||||
@@ -2,6 +2,7 @@
|
||||
#define CONFIGURATION_H
|
||||
|
||||
#include <map>
|
||||
+#include <string>
|
||||
|
||||
namespace config
|
||||
{
|
Loading…
Reference in New Issue
Block a user