From 7547cf9dfcc36a36939d3b97ca766f64a1012ad3 Mon Sep 17 00:00:00 2001
From: Greg Price <gnprice@gmail.com>
Date: Mon, 6 Apr 2020 20:32:19 -0700
Subject: [PATCH 1/2] treewide: Fix up stripDebugList attrs to be lists.

The documentation says this should be a list, and it already is in
about half the expressions that set it.

The difference doesn't matter at present, because these values are all
space-free literals.  But it will in a future with __structuredAttrs .

(The similar attr stripAllList has no users in the nixpkgs tree, so
there's nothing to do to fix any of those up.)
---
 pkgs/applications/misc/far2l/default.nix    | 2 +-
 pkgs/development/libraries/ldb/default.nix  | 2 +-
 pkgs/development/misc/avr/libc/default.nix  | 2 +-
 pkgs/os-specific/linux/syslinux/default.nix | 2 +-
 pkgs/servers/http/apache-httpd/2.4.nix      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix
index 7c6573630a15..572ec3dda15e 100644
--- a/pkgs/applications/misc/far2l/default.nix
+++ b/pkgs/applications/misc/far2l/default.nix
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
     wrapProgram $out/bin/far2l --argv0 $out/bin/far2l
   '';
 
-  stripDebugList = "bin share";
+  stripDebugList = [ "bin" "share" ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix
index 7ee869b53c35..a0cb8a7762b5 100644
--- a/pkgs/development/libraries/ldb/default.nix
+++ b/pkgs/development/libraries/ldb/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     "--without-ldb-lmdb"
   ];
 
-  stripDebugList = "bin lib modules";
+  stripDebugList = [ "bin" "lib" "modules" ];
 
   meta = with stdenv.lib; {
     description = "A LDAP-like embedded database";
diff --git a/pkgs/development/misc/avr/libc/default.nix b/pkgs/development/misc/avr/libc/default.nix
index 48ea088a73c9..84e9c0751342 100644
--- a/pkgs/development/misc/avr/libc/default.nix
+++ b/pkgs/development/misc/avr/libc/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ automake autoconf ];
 
   # Make sure we don't strip the libraries in lib/gcc/avr.
-  stripDebugList = "bin";
+  stripDebugList = [ "bin" ];
   dontPatchELF = true;
 
   passthru = {
diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix
index ed901b21ac11..02d19c8a2029 100644
--- a/pkgs/os-specific/linux/syslinux/default.nix
+++ b/pkgs/os-specific/linux/syslinux/default.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation {
   enableParallelBuilding = false; # Fails very rarely with 'No rule to make target: ...'
   hardeningDisable = [ "pic" "stackprotector" "fortify" ];
 
-  stripDebugList = "bin sbin share/syslinux/com32";
+  stripDebugList = [ "bin" "sbin" "share/syslinux/com32" ];
 
   makeFlags = [
     "BINDIR=$(out)/bin"
diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix
index 252365098ddc..658de79385a9 100644
--- a/pkgs/servers/http/apache-httpd/2.4.nix
+++ b/pkgs/servers/http/apache-httpd/2.4.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  stripDebugList = "lib modules bin";
+  stripDebugList = [ "lib" "modules" "bin" ];
 
   postInstall = ''
     mkdir -p $doc/share/doc/httpd

From 53d61f91d2467f6f3b9186dd3a7b51b491311fc2 Mon Sep 17 00:00:00 2001
From: Greg Price <gnprice@gmail.com>
Date: Mon, 6 Apr 2020 20:42:36 -0700
Subject: [PATCH 2/2] doc/stdenv: Update default for stripDebugList.

This has changed a few times from 2008 to 2012: cdc74e167, d9213df2c,
and 095db9fe3.
---
 doc/stdenv/stdenv.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/stdenv/stdenv.xml b/doc/stdenv/stdenv.xml
index 1e97bf6157bb..b589952743c3 100644
--- a/doc/stdenv/stdenv.xml
+++ b/doc/stdenv/stdenv.xml
@@ -1295,7 +1295,7 @@ installTargets = "install-bin install-doc";</programlisting>
      </term>
      <listitem>
       <para>
-       List of directories to search for libraries and executables from which only debugging-related symbols should be stripped. It defaults to <literal>lib bin sbin</literal>.
+       List of directories to search for libraries and executables from which only debugging-related symbols should be stripped. It defaults to <literal>lib lib32 lib64 libexec bin sbin</literal>.
       </para>
      </listitem>
     </varlistentry>