public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #80112 from vcunat/p/glibc-python

Browse Source 
glibc: use python3Minimal instead of python3
This commit is contained in:
worldofpeace 2020-02-15 15:20:13 -05:00 committed by GitHub
commit 108304675f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/glibc/common.nix
View File

@ -24,7 +24,7 @@
, gd ? null, libpng ? null , gd ? null, libpng ? null
, libidn2 , libidn2
, bison , bison
, python3 , python3Minimal
}: }:
{ name { name
@ -155,7 +155,7 @@ stdenv.mkDerivation ({
outputs = [ "out" "bin" "dev" "static" ]; outputs = [ "out" "bin" "dev" "static" ];
depsBuildBuild = [ buildPackages.stdenv.cc ]; depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ bison python3 ]; nativeBuildInputs = [ bison python3Minimal ];
buildInputs = [ linuxHeaders ] ++ lib.optionals withGd [ gd libpng ]; buildInputs = [ linuxHeaders ] ++ lib.optionals withGd [ gd libpng ];
# Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to # Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to

4
pkgs/development/libraries/openssl/default.nix
View File

@ -36,9 +36,7 @@ let
outputs = [ "bin" "dev" "out" "man" ] ++ optional withDocs "doc"; outputs = [ "bin" "dev" "out" "man" ] ++ optional withDocs "doc";
setOutputFlags = false; setOutputFlags = false;
separateDebugInfo = !(stdenv.hostPlatform.useLLVM or false) separateDebugInfo = !(stdenv.hostPlatform.useLLVM or false) && stdenv.cc.isGNU;
&& stdenv.hostPlatform == stdenv.buildPlatform # unable to fix infinite recursion on stdenv.cc
&& stdenv.cc.isGNU;
nativeBuildInputs = [ perl ]; nativeBuildInputs = [ perl ];
buildInputs = stdenv.lib.optional withCryptodev cryptodev; buildInputs = stdenv.lib.optional withCryptodev cryptodev;