git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #122915 from polygon/caprice32

caprice32: Add <string> include

commitf1852527a9e7851623ad68abf5813528c7b743cd authorGuillaume Girol <symphorien@users.noreply.github.com> dateSun 16 May 2021, 08:54 (6 years ago) parentb0d25977b1fad0
2 files changed+17
pkgs/misc/emulators/caprice32/default.nix+5 pkgs/misc/emulators/caprice32/string.patch+12
pkgs/misc/emulators/caprice32/default.nix+5
@@ -5,6 +5,9 @@ stdenv.mkDerivation rec {
55
66 pname = "caprice32";
77 version = "4.6.0";
8+ # NOTE: When bumping version beyond 4.6.0, you likely need to remove
9+ # string.patch below. The fix of this patch has already been
10+ # done upstream but is not yet part of a release
811
912 src = fetchFromGitHub {
1013 repo = "caprice32";
@@ -16,6 +19,8 @@ stdenv.mkDerivation rec {
1619 nativeBuildInputs = [ desktop-file-utils pkg-config ];
1720 buildInputs = [ libpng SDL freetype zlib ];
1821
22+ patches = [ ./string.patch ];
23+
1924 makeFlags = [
2025 "APP_PATH=${placeholder "out"}/share/caprice32"
2126 "RELEASE=1"
pkgs/misc/emulators/caprice32/string.patchnew file+12
@@ -0,0 +1,12 @@
1+diff --git a/src/configuration.h b/src/configuration.h
2+index 34fd690..97fb0e5 100644
3+--- a/src/configuration.h
4++++ b/src/configuration.h
5+@@ -2,6 +2,7 @@
6+ #define CONFIGURATION_H
7+
8+ #include <map>
9++#include <string>
10+
11+ namespace config
12+ {