diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-12-20 06:11:26 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2021-01-03 19:18:16 +0000 |
| commit | f52263ced0937e72453e7fbce9fefb5f425f650b (patch) | |
| tree | 55b8627bc37cfdc7ce683f14b6180609fa7e3dbe /pkgs/development/libraries/gmp | |
| parent | 0df75bc04e14e4af11e0124791bfd41bbff51b88 (diff) | |
| download | nixpkgs-f52263ced0937e72453e7fbce9fefb5f425f650b.tar nixpkgs-f52263ced0937e72453e7fbce9fefb5f425f650b.tar.gz nixpkgs-f52263ced0937e72453e7fbce9fefb5f425f650b.tar.bz2 nixpkgs-f52263ced0937e72453e7fbce9fefb5f425f650b.tar.lz nixpkgs-f52263ced0937e72453e7fbce9fefb5f425f650b.tar.xz nixpkgs-f52263ced0937e72453e7fbce9fefb5f425f650b.tar.zst nixpkgs-f52263ced0937e72453e7fbce9fefb5f425f650b.zip | |
treewide: Start to break up static overlay
We can use use `stdenv.hostPlatform.isStatic` instead, and move the logic per package. The least opionated benefit of this is that it makes it much easier to replace packages with modified ones, as there is no longer any issue of overlay order. CC @FRidh @matthewbauer
Diffstat (limited to 'pkgs/development/libraries/gmp')
| -rw-r--r-- | pkgs/development/libraries/gmp/5.1.x.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/libraries/gmp/6.x.nix | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix index a027d58de39..a514934e964 100644 --- a/pkgs/development/libraries/gmp/5.1.x.nix +++ b/pkgs/development/libraries/gmp/5.1.x.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchurl, m4, cxx ? true, withStatic ? true }: +{ stdenv, fetchurl, m4 +, cxx ? true +, withStatic ? stdenv.hostPlatform.isStatic +}: let inherit (stdenv.lib) optional; in diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index 10e63f733a2..522976d3ab2 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, m4 , cxx ? !stdenv.hostPlatform.useAndroidPrebuilt && !stdenv.hostPlatform.isWasm , buildPackages -, withStatic ? false }: +, withStatic ? stdenv.hostPlatform.isStatic +}: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or |