diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2021-01-07 13:04:31 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2021-01-07 13:04:31 +0100 |
commit | f19eb635b4585f6ba4f9f4c3e9e07f56623446f5 (patch) | |
tree | 4d64a15e34e8a2b54466ba165297a6bb08bfb280 /pkgs/development/interpreters/python/cpython | |
parent | 0e4e47512d709e93c35fa575dd82e3e6ce4f884d (diff) | |
parent | 2be707eca80b573c931007de78c936d49ab45395 (diff) | |
download | nixpkgs-f19eb635b4585f6ba4f9f4c3e9e07f56623446f5.tar nixpkgs-f19eb635b4585f6ba4f9f4c3e9e07f56623446f5.tar.gz nixpkgs-f19eb635b4585f6ba4f9f4c3e9e07f56623446f5.tar.bz2 nixpkgs-f19eb635b4585f6ba4f9f4c3e9e07f56623446f5.tar.lz nixpkgs-f19eb635b4585f6ba4f9f4c3e9e07f56623446f5.tar.xz nixpkgs-f19eb635b4585f6ba4f9f4c3e9e07f56623446f5.tar.zst nixpkgs-f19eb635b4585f6ba4f9f4c3e9e07f56623446f5.zip |
Merge branch 'master' into staging-next
https://github.com/NixOS/nixpkgs/commit/b04fc593e7b55fe1f74421b11589f12a339c92e2 seems to have accidentally changed mkDerivation function for dfilemanager and solarus-quest-editor so I have reverted that here.
Diffstat (limited to 'pkgs/development/interpreters/python/cpython')
-rw-r--r-- | pkgs/development/interpreters/python/cpython/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 2394e0e259e..f18fe181a7b 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -35,7 +35,7 @@ , rebuildBytecode ? true , stripBytecode ? false , includeSiteCustomize ? true -, static ? false +, static ? stdenv.hostPlatform.isStatic # Not using optimizations on Darwin # configure: error: llvm-profdata is required for a --enable-optimizations build but could not be found. , enableOptimizations ? (!stdenv.isDarwin) |