diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-01-14 00:02:26 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-14 00:02:26 +0000 |
| commit | 4712ed9439386730e93043de43bfc1d4b6f2f297 (patch) | |
| tree | 382dc21b6250da85fcdceaf610afff45c8e8932e /pkgs/development/libraries/glibc/common.nix | |
| parent | 49722fd14a26ca6a751932949491a87afe592d0d (diff) | |
| parent | 4e7b6a7ddbe276281cd3882dd42b701f51b48c6b (diff) | |
| download | nixpkgs-4712ed9439386730e93043de43bfc1d4b6f2f297.tar nixpkgs-4712ed9439386730e93043de43bfc1d4b6f2f297.tar.gz nixpkgs-4712ed9439386730e93043de43bfc1d4b6f2f297.tar.bz2 nixpkgs-4712ed9439386730e93043de43bfc1d4b6f2f297.tar.lz nixpkgs-4712ed9439386730e93043de43bfc1d4b6f2f297.tar.xz nixpkgs-4712ed9439386730e93043de43bfc1d4b6f2f297.tar.zst nixpkgs-4712ed9439386730e93043de43bfc1d4b6f2f297.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/libraries/glibc/common.nix')
| -rw-r--r-- | pkgs/development/libraries/glibc/common.nix | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index c9bc557eec1..780a3e091da 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -37,7 +37,6 @@ , profilingLibraries ? false , withGd ? false , withLibcrypt ? false -, meta , extraBuildInputs ? [] , extraNativeBuildInputs ? [] , ... @@ -262,9 +261,5 @@ stdenv.mkDerivation ({ maintainers = with maintainers; [ eelco ma27 ]; platforms = platforms.linux; - } // meta; -} - -// lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) { - preInstall = null; # clobber the native hook + } // (args.meta or {}); }) |