philipp
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Merge pull request #84551 from gnprice/pr-stripDebugList 

treewide: Fix types of stripDebugList attrs (and fix doc)
gstqt5
Maximilian Bosch 2020-04-14 15:54:52 +02:00 committed by GitHub
parent 5d2cb158f3 53d61f91d2
commit 401e07d419
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/stdenv/stdenv.xml
View File

@ -1295,7 +1295,7 @@ installTargets = "install-bin install-doc";</programlisting>
</term> </term>
<listitem> <listitem>
<para> <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> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>

2
pkgs/applications/misc/far2l/default.nix
View File

@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/far2l --argv0 $out/bin/far2l wrapProgram $out/bin/far2l --argv0 $out/bin/far2l
''; '';
stripDebugList = "bin share"; stripDebugList = [ "bin" "share" ];
enableParallelBuilding = true; enableParallelBuilding = true;

2
pkgs/development/libraries/ldb/default.nix
View File

@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
"--without-ldb-lmdb" "--without-ldb-lmdb"
]; ];
stripDebugList = "bin lib modules"; stripDebugList = [ "bin" "lib" "modules" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A LDAP-like embedded database"; description = "A LDAP-like embedded database";

2
pkgs/development/misc/avr/libc/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ automake autoconf ]; nativeBuildInputs = [ automake autoconf ];
# Make sure we don't strip the libraries in lib/gcc/avr. # Make sure we don't strip the libraries in lib/gcc/avr.
stripDebugList = "bin"; stripDebugList = [ "bin" ];
dontPatchELF = true; dontPatchELF = true;
passthru = { passthru = {

2
pkgs/os-specific/linux/syslinux/default.nix
View File

@ -56,7 +56,7 @@ stdenv.mkDerivation {
enableParallelBuilding = false; # Fails very rarely with 'No rule to make target: ...' enableParallelBuilding = false; # Fails very rarely with 'No rule to make target: ...'
hardeningDisable = [ "pic" "stackprotector" "fortify" ]; hardeningDisable = [ "pic" "stackprotector" "fortify" ];
stripDebugList = "bin sbin share/syslinux/com32"; stripDebugList = [ "bin" "sbin" "share/syslinux/com32" ];
makeFlags = [ makeFlags = [
"BINDIR=$(out)/bin" "BINDIR=$(out)/bin"

2
pkgs/servers/http/apache-httpd/2.4.nix
View File

@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
stripDebugList = "lib modules bin"; stripDebugList = [ "lib" "modules" "bin" ];
postInstall = '' postInstall = ''
mkdir -p $doc/share/doc/httpd mkdir -p $doc/share/doc/httpd