diff options
author | Maximilian Bosch <maximilian@mbosch.me> | 2020-04-14 15:54:52 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-14 15:54:52 +0200 |
commit | 401e07d41981561e328d2ddc667ca96e1d5ef325 (patch) | |
tree | a8970aabf91f9c5268aefb7b7a5c66fd2ec37aa5 /pkgs | |
parent | 5d2cb158f390804aeaff1a7f1c0dc45665c9d1f9 (diff) | |
parent | 53d61f91d2467f6f3b9186dd3a7b51b491311fc2 (diff) | |
download | nixlib-401e07d41981561e328d2ddc667ca96e1d5ef325.tar nixlib-401e07d41981561e328d2ddc667ca96e1d5ef325.tar.gz nixlib-401e07d41981561e328d2ddc667ca96e1d5ef325.tar.bz2 nixlib-401e07d41981561e328d2ddc667ca96e1d5ef325.tar.lz nixlib-401e07d41981561e328d2ddc667ca96e1d5ef325.tar.xz nixlib-401e07d41981561e328d2ddc667ca96e1d5ef325.tar.zst nixlib-401e07d41981561e328d2ddc667ca96e1d5ef325.zip |
Merge pull request #84551 from gnprice/pr-stripDebugList
treewide: Fix types of stripDebugList attrs (and fix doc)
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/misc/far2l/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/ldb/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/misc/avr/libc/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/syslinux/default.nix | 2 | ||||
-rw-r--r-- | 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 1a79554f0fe3..de2ed0d15964 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 fdff792648cf..6682f72c62de 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 ddeb9ed6de06..94df0649ad4a 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 2e3d936bbe1c..c84790ba1060 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 |