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

apache: strip extra dirs. #14823

Closed
wants to merge 1 commit into from
Closed

apache: strip extra dirs. #14823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions pkgs/servers/http/apache-httpd/2.2.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
# FIXME: -dev depends on -doc
outputs = [ "dev" "out" "doc" ];
setOutputFlags = false; # it would move $out/modules, etc.
stripDebugList= [ "bin" "lib" "modules" ]; # also strip modules.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the purpose of this modification? This doesn't seem to change anything, really. Am I missing something?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, it does not change anything to apache 2.2, it simply unifies the syntax with 2.4.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I could of course unify the other way around, but I feel this makes more sense with the name of the variable, and with the other pull requests I just made.


propagatedBuildInputs = [ apr ]; # otherwise mod_* fail to find includes often
buildInputs = [ pkgconfig perl aprutil pcre zlib ] ++
Expand Down Expand Up @@ -56,8 +57,6 @@ stdenv.mkDerivation rec {

enableParallelBuilding = true;

stripDebugList = "lib modules bin";

postInstall = ''
mkdir -p $doc/share/doc/httpd
mv $out/manual $doc/share/doc/httpd
Expand Down
1 change: 1 addition & 0 deletions 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 @@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
# FIXME: -dev depends on -doc
outputs = [ "dev" "out" "doc" ];
setOutputFlags = false; # it would move $out/modules, etc.
stripDebugList= [ "bin" "lib" "modules" ]; # also strip modules.

buildInputs = [perl] ++
optional sslSupport openssl ++
Expand Down