Merge 171819: makeBinaryWrapper: add -Wno-overlength-strings

...into staging-next
2022-05-07 07:25:16 +02:00
parent 005e2edc05 888c82fbba
commit 3dc2052b50
10 changed files with 32 additions and 12 deletions
@@ -33,8 +33,7 @@ assertExecutable() {
 # To troubleshoot a binary wrapper after you compiled it,
 # use the `strings` command or open the binary file in a text editor.
 makeWrapper() {
-    local NIX_CFLAGS_COMPILE NIX_CFLAGS_LINK
-    unset NIX_CFLAGS_COMPILE NIX_CFLAGS_LINK
+    local NIX_CFLAGS_COMPILE= NIX_CFLAGS_LINK=
    local original="$1"
    local wrapper="$2"
    shift 2
@@ -46,6 +45,7 @@ makeWrapper() {
    makeDocumentedCWrapper "$original" "$@" | \
      @CC@ \
        -Wall -Werror -Wpedantic \
+        -Wno-overlength-strings \
        -Os \
        -x c \
        -o "$wrapper" -
@@ -80,8 +80,6 @@ stdenv.mkDerivation rec {
    pipewire # PipeWire provides a gstreamer plugin for using PipeWire for video
  ];

-  NIX_CFLAGS_COMPILE = "-Wno-error=overlength-strings";
-
  postPatch = ''
    chmod +x meson_post_install.py
    patchShebangs meson_post_install.py
@@ -69,8 +69,6 @@ stdenv.mkDerivation rec {
    webkitgtk
  ];

-  NIX_CFLAGS_COMPILE = "-Wno-error=overlength-strings";
-
  postPatch = ''
    chmod +x meson_post_install.py # patchShebangs requires executable file
    patchShebangs meson_post_install.py
@@ -76,8 +76,6 @@ python3.pkgs.buildPythonApplication rec {
    gst-plugins-ugly
  ]);

-  NIX_CFLAGS_COMPILE = "-Wno-error=overlength-strings";
-
  pythonPath = with python3.pkgs; [
    pycairo
    dbus-python
@@ -175,8 +175,6 @@ stdenv.mkDerivation rec {
    pythonEnv
  ];

-  NIX_CFLAGS_COMPILE = "-Wno-error=overlength-strings";
-
  mesonFlags = [
    "-Dgtk_doc=true"
  ];
@@ -77,8 +77,6 @@ stdenv.mkDerivation rec {
    xvfb-run
  ];

-  NIX_CFLAGS_COMPILE = "-Wno-error=overlength-strings";
-
  mesonFlags = [
    # TODO: https://github.com/NixOS/nixpkgs/issues/36468
    "-Dc_args=-I${glib.dev}/include/gio-unix-2.0"
@@ -44,6 +44,7 @@ let
      "invalid-env"
      "prefix"
      "suffix"
+      "overlength-strings"
    ];
    f = name: lib.nameValuePair name (makeGoldenTest name);
  in builtins.listToAttrs (builtins.map f names);