about summary refs log tree commit diff
path: root/nixpkgs/pkgs/games/trigger
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2019-05-17 10:56:54 +0000
committerAlyssa Ross <hi@alyssa.is>2019-05-17 10:56:54 +0000
commitc1d22074139ab0d048a05b5e5116265d099114d6 (patch)
tree97977009422d675f8930f97c309b010481289e72 /nixpkgs/pkgs/games/trigger
parent4dc8afe4fd6b18437150129e0a1ecc23c6a1c0b9 (diff)
parentbc9df0f66110039e495b6debe3a6cda4a1bb0fed (diff)
downloadnixlib-c1d22074139ab0d048a05b5e5116265d099114d6.tar
nixlib-c1d22074139ab0d048a05b5e5116265d099114d6.tar.gz
nixlib-c1d22074139ab0d048a05b5e5116265d099114d6.tar.bz2
nixlib-c1d22074139ab0d048a05b5e5116265d099114d6.tar.lz
nixlib-c1d22074139ab0d048a05b5e5116265d099114d6.tar.xz
nixlib-c1d22074139ab0d048a05b5e5116265d099114d6.tar.zst
nixlib-c1d22074139ab0d048a05b5e5116265d099114d6.zip
Merge commit 'bc9df0f66110039e495b6debe3a6cda4a1bb0fed'
Diffstat (limited to 'nixpkgs/pkgs/games/trigger')
-rw-r--r--nixpkgs/pkgs/games/trigger/search.patch14
1 files changed, 0 insertions, 14 deletions
diff --git a/nixpkgs/pkgs/games/trigger/search.patch b/nixpkgs/pkgs/games/trigger/search.patch
deleted file mode 100644
index 60a69b159b5b..000000000000
--- a/nixpkgs/pkgs/games/trigger/search.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/Trigger/main.cpp b/src/Trigger/main.cpp
-index 39539e1..680c12c 100644
---- a/src/Trigger/main.cpp
-+++ b/src/Trigger/main.cpp
-@@ -890,7 +890,8 @@ bool MainApp::loadAll()
-                 std::smatch mr; // Match Results
-                 std::regex pat(R"(^(\w+)(\..+)$)"); // Pattern
- 
--                if (!std::regex_search(std::string(*fname), mr, pat))
-+                std::string search(*fname);
-+                if (!std::regex_search(search, mr, pat))
-                     continue;
- 
-                 std::string basefname = mr[1];