From 39696b6d56fbe93834a8997057b3507e8cd2a234 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 15 May 2018 19:09:29 -0500 Subject: [PATCH] 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] --- pkgs/development/libraries/qt-5/modules/qtbase.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 8887e05704d2..28b250437d08 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -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;