about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2019-11-29 22:52:19 +0100
committerGitHub <noreply@github.com>2019-11-29 22:52:19 +0100
commit05aff9a63505b55e24b068aa45f6cdc4850677ee (patch)
tree3e25a792fbb0bff0b189842977531da0ef906705
parent2a20a92159da94f347883510557002be3b3e1c6a (diff)
parentab57084656907119270214309e05c3c15888d1b3 (diff)
downloadnixlib-05aff9a63505b55e24b068aa45f6cdc4850677ee.tar
nixlib-05aff9a63505b55e24b068aa45f6cdc4850677ee.tar.gz
nixlib-05aff9a63505b55e24b068aa45f6cdc4850677ee.tar.bz2
nixlib-05aff9a63505b55e24b068aa45f6cdc4850677ee.tar.lz
nixlib-05aff9a63505b55e24b068aa45f6cdc4850677ee.tar.xz
nixlib-05aff9a63505b55e24b068aa45f6cdc4850677ee.tar.zst
nixlib-05aff9a63505b55e24b068aa45f6cdc4850677ee.zip
Merge pull request #74680 from anmonteiro/anmonteiro/fix-kitty-0.15-patch
kitty: Fix patch that doesn't apply in v0.15.0
-rw-r--r--pkgs/applications/misc/kitty/no-werror.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/misc/kitty/no-werror.patch b/pkgs/applications/misc/kitty/no-werror.patch
index 8217b5ef51a6..92a652588550 100644
--- a/pkgs/applications/misc/kitty/no-werror.patch
+++ b/pkgs/applications/misc/kitty/no-werror.patch
@@ -1,11 +1,11 @@
 --- a/setup.py
 +++ b/setup.py
-@@ -212,7 +212,7 @@
+@@ -217,7 +217,7 @@ def init_env(
      cflags = os.environ.get(
          'OVERRIDE_CFLAGS', (
-             '-Wextra -Wno-missing-field-initializers -Wall -Wstrict-prototypes -std=c11'
+             '-Wextra {} -Wno-missing-field-initializers -Wall -Wstrict-prototypes -std={}11'
 -            ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden'
 +            ' {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden'
          ).format(
+             float_conversion, std,
              optimize,
-             ' '.join(sanitize_args),