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

glibc: use python3Minimal instead of python3 #80112

Merged
merged 2 commits into from
Feb 15, 2020
Merged

glibc: use python3Minimal instead of python3 #80112

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
f651910
glibc: use python3Minimal instead of python3
vcunat Feb 14, 2020
5a8000d
openssl: revert a workaround that's no longer needed
vcunat Feb 14, 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
4 changes: 2 additions & 2 deletions pkgs/development/libraries/glibc/common.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
, gd ? null, libpng ? null
, libidn2
, bison
, python3
, python3Minimal
}:

{ name
Expand Down Expand Up @@ -155,7 +155,7 @@ stdenv.mkDerivation ({
outputs = [ "out" "bin" "dev" "static" ];

depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ bison python3 ];
nativeBuildInputs = [ bison python3Minimal ];
buildInputs = [ linuxHeaders ] ++ lib.optionals withGd [ gd libpng ];

# Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to
Expand Down
4 changes: 1 addition & 3 deletions pkgs/development/libraries/openssl/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,7 @@ let

outputs = [ "bin" "dev" "out" "man" ] ++ optional withDocs "doc";
setOutputFlags = false;
separateDebugInfo = !(stdenv.hostPlatform.useLLVM or false)
&& stdenv.hostPlatform == stdenv.buildPlatform # unable to fix infinite recursion on stdenv.cc
&& stdenv.cc.isGNU;
separateDebugInfo = !(stdenv.hostPlatform.useLLVM or false) && stdenv.cc.isGNU;

nativeBuildInputs = [ perl ];
buildInputs = stdenv.lib.optional withCryptodev cryptodev;
Expand Down