diff options
| author | John Ericson <git@JohnEricson.me> | 2021-01-23 16:32:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-23 16:32:36 -0500 |
| commit | 12881a7aa703beb3fbf2b26f8cfd76e9bd67ae6b (patch) | |
| tree | db1aa4bc8b04bbcd14e549020e3cfc4546356446 /pkgs/development/libraries | |
| parent | 10bb07207285db91a5733078e1f84ba4d8ef5b78 (diff) | |
| parent | 2dde58903e0f2f490088c3b0cedadc9b479da085 (diff) | |
| download | nixpkgs-12881a7aa703beb3fbf2b26f8cfd76e9bd67ae6b.tar nixpkgs-12881a7aa703beb3fbf2b26f8cfd76e9bd67ae6b.tar.gz nixpkgs-12881a7aa703beb3fbf2b26f8cfd76e9bd67ae6b.tar.bz2 nixpkgs-12881a7aa703beb3fbf2b26f8cfd76e9bd67ae6b.tar.lz nixpkgs-12881a7aa703beb3fbf2b26f8cfd76e9bd67ae6b.tar.xz nixpkgs-12881a7aa703beb3fbf2b26f8cfd76e9bd67ae6b.tar.zst nixpkgs-12881a7aa703beb3fbf2b26f8cfd76e9bd67ae6b.zip | |
Merge pull request #110544 from Ericson2314/no-platform
top-level, lib: Remove platform attribute of platforms
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/glibc/common.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-5/modules/qtwebengine.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 6b17e463d76..6637a9bb2a3 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -158,7 +158,7 @@ stdenv.mkDerivation ({ "--enable-kernel=3.2.0" # can't get below with glibc >= 2.26 ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ (lib.flip lib.withFeature "fp" - (stdenv.hostPlatform.platform.gcc.float or (stdenv.hostPlatform.parsed.abi.float or "hard") == "soft")) + (stdenv.hostPlatform.gcc.float or (stdenv.hostPlatform.parsed.abi.float or "hard") == "soft")) "--with-__thread" ] ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform && stdenv.hostPlatform.isAarch32) [ "--host=arm-linux-gnueabi" diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 1ad254ffcd0..b79479e5dba 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -88,7 +88,7 @@ qtModule { NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ # with gcc8, -Wclass-memaccess became part of -Wall and this exceeds the logging limit "-Wno-class-memaccess" - ] ++ lib.optionals (stdenv.hostPlatform.platform.gcc.arch or "" == "sandybridge") [ + ] ++ lib.optionals (stdenv.hostPlatform.gcc.arch or "" == "sandybridge") [ # it fails when compiled with -march=sandybridge https://github.com/NixOS/nixpkgs/pull/59148#discussion_r276696940 # TODO: investigate and fix properly "-march=westmere" |