Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

treewide: Fix types of stripDebugList attrs (and fix doc) #84551

Merged
merged 2 commits into from
Apr 14, 2020
Merged

treewide: Fix types of stripDebugList attrs (and fix doc) #84551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7547cf9
treewide: Fix up stripDebugList attrs to be lists.
gnprice Apr 7, 2020
53d61f9
doc/stdenv: Update default for stripDebugList.
gnprice Apr 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/stdenv/stdenv.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/misc/far2l/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/far2l --argv0 $out/bin/far2l
'';

stripDebugList = "bin share";
stripDebugList = [ "bin" "share" ];

enableParallelBuilding = true;

Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/libraries/ldb/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/misc/avr/libc/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
2 changes: 1 addition & 1 deletion pkgs/os-specific/linux/syslinux/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkgs/servers/http/apache-httpd/2.4.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ stdenv.mkDerivation rec {

enableParallelBuilding = true;

stripDebugList = "lib modules bin";
stripDebugList = [ "lib" "modules" "bin" ];

postInstall = ''
mkdir -p $doc/share/doc/httpd
Expand Down