diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2021-01-03 21:40:14 +0000 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2021-01-03 21:46:14 +0000 |
commit | 5c2965145f322386d45db04c409fd2f8a3c3b478 (patch) | |
tree | 67c42ad4baaf5a9f52e8623310a3e381b2004cb8 /pkgs/development | |
parent | 9c9c6461ba79a6c233741760045f3b44be5924dd (diff) |
treewide: Inline more of the static overlay
Picking up where #107238 left off. I think I'll have gotten all the easy stuff with this.
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/interpreters/python/cpython/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/cdo/default.nix | 9 | ||||
-rw-r--r-- | pkgs/development/libraries/crc32c/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/libraries/gsm/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/libraries/libev/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/libraries/libressl/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/nghttp2/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/snappy/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/web/woff2/default.nix | 4 |
9 files changed, 25 insertions, 11 deletions
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index c67ede82003a5..b9f1820df3e87 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) diff --git a/pkgs/development/libraries/cdo/default.nix b/pkgs/development/libraries/cdo/default.nix index f582be81e86e2..10e145b34ea28 100644 --- a/pkgs/development/libraries/cdo/default.nix +++ b/pkgs/development/libraries/cdo/default.nix @@ -1,7 +1,10 @@ { stdenv, fetchurl, curl, hdf5, netcdf -, enable_cdi_lib ? false # build, install and link to a CDI library [default=no] -, enable_all_static ? false # build a completely statically linked CDO binary [default=no] -, enable_cxx ? false # Use CXX as default compiler [default=no] +, # build, install and link to a CDI library [default=no] + enable_cdi_lib ? false +, # build a completely statically linked CDO binary + enable_all_static ? stdenv.hostPlatform.isStatic +, # Use CXX as default compiler [default=no] + enable_cxx ? false }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/crc32c/default.nix b/pkgs/development/libraries/crc32c/default.nix index b9c12b1889c21..c10d218ea42cc 100644 --- a/pkgs/development/libraries/crc32c/default.nix +++ b/pkgs/development/libraries/crc32c/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, fetchFromGitHub, cmake, gflags -, staticOnly ? false }: +, staticOnly ? stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation rec { pname = "crc32c"; diff --git a/pkgs/development/libraries/gsm/default.nix b/pkgs/development/libraries/gsm/default.nix index 30cffa89938d9..7214aa6f6b9cf 100644 --- a/pkgs/development/libraries/gsm/default.nix +++ b/pkgs/development/libraries/gsm/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl -, staticSupport ? false # Compile statically (support for packages that look for the static object) +, # Compile statically (support for packages that look for the static object) + staticSupport ? stdenv.hostPlatform.isStatic }: let diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/development/libraries/libev/default.nix index 1ea0615dc2341..9f950ebb09c06 100644 --- a/pkgs/development/libraries/libev/default.nix +++ b/pkgs/development/libraries/libev/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchurl, static ? false }: +{ stdenv, fetchurl +, # Note: -static hasn’t work on darwin + static ? with stdenv.hostPlatform; isStatic && !isDarwin +}: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index 1f6313d8caab1..ae0b63f5577fc 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, lib, cmake, cacert, fetchpatch, buildShared ? true }: +{ stdenv, fetchurl, lib, cmake, cacert, fetchpatch +, buildShared ? !stdenv.hostPlatform.isStatic +}: let diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index c9ccf63f8895c..7bcdf8feb3025 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -8,7 +8,7 @@ , enableAsioLib ? false, boost ? null , enableGetAssets ? false, libxml2 ? null , enableJemalloc ? false, jemalloc ? null -, enableApp ? !stdenv.hostPlatform.isWindows +, enableApp ? with stdenv.hostPlatform; !isWindows && !isStatic , enablePython ? false, python ? null, cython ? null, ncurses ? null, setuptools ? null }: diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix index e626db8efb78d..0880df7ef2f04 100644 --- a/pkgs/development/libraries/snappy/default.nix +++ b/pkgs/development/libraries/snappy/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake, static ? false }: +{ stdenv, fetchFromGitHub, cmake +, static ? stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation rec { pname = "snappy"; diff --git a/pkgs/development/web/woff2/default.nix b/pkgs/development/web/woff2/default.nix index d770fb6275364..aadeb3cd04373 100644 --- a/pkgs/development/web/woff2/default.nix +++ b/pkgs/development/web/woff2/default.nix @@ -1,4 +1,6 @@ -{ brotli, cmake, pkgconfig, fetchFromGitHub, stdenv, static ? false }: +{ brotli, cmake, pkgconfig, fetchFromGitHub, stdenv +, static ? stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation rec { pname = "woff2"; |