Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4d8a4bcc3dad
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a7b6a9199e8d
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jun 13, 2018

  1. qt-5.10: don't use features that require new-ish kernels, stay compat 

    Before this change:
$ readelf --notes /nix/store/zf5yja02g8n8dzgs25pqfd8w3myfzgzc-qtbase-5.10.1/lib/libQt5Core.so

Displaying notes found at file offset 0x004a7778 with length 0x00000020:
  Owner                 Data size       Description
  GNU                  0x00000010       NT_GNU_ABI_TAG (ABI version tag)
    OS: Linux, ABI: 3.17.0

After:
$ readelf --notes /nix/store/sg1s9hdw0b7p6h0dwg09g4lxy1acq7y6-qtbase-5.10.1/lib/libQt5Core.so

Displaying notes found at file offset 0x004a7dcc with length 0x00000020:
  Owner                 Data size       Description
  GNU                  0x00000010       NT_GNU_ABI_TAG (ABI version tag)
    OS: Linux, ABI: 2.6.28

-----------

The above paths were before rebasing the commit onto staging,
and it'd probably be good to have someone confirm the same happens
when built on a hydra builder or other non-dtzWill machine :).

[dezgeg: added comments]

(cherry picked from commit 39696b6)
    @dtzWill @dezgeg
    dtzWill authored and dezgeg committed Jun 13, 2018
    Copy the full SHA
    a7b6a91 View commit details
Showing with 6 additions and 0 deletions.
  1. +6 −0 pkgs/development/libraries/qt-5/modules/qtbase.nix
6 changes: 6 additions & 0 deletions pkgs/development/libraries/qt-5/modules/qtbase.nix
View file
Original file line number Diff line number Diff line change
@@ -327,6 +327,12 @@ stdenv.mkDerivation {
]
++ lib.optional withGtk3 "-gtk"
++ lib.optional (compareVersion "5.9.0" >= 0) "-inotify"
++ lib.optionals (compareVersion "5.10.0" >= 0) [
# Without these, Qt stops working on kernels < 3.17. See:
# https://github.com/NixOS/nixpkgs/issues/38832
"-no-feature-renameat2"
"-no-feature-getentropy"
]
);

enableParallelBuilding = true;