Merge pull request #23275 from ttuegel/qt-5.7-fixes

Qt 5.7 fixes

pkgs/applications/graphics/ipe/default.nix

@@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
     sed -i -e 's/install -s/install/' common.mak || die
   '';
 
+  NIX_CFLAGS_COMPILE = [ "-std=c++11" ]; # build with Qt 5.7
+
   IPEPREFIX="$$out";
   URWFONTDIR="${texlive}/texmf-dist/fonts/type1/urw/";
   LUA_PACKAGE = "lua";

pkgs/development/libraries/kde-frameworks/attica.nix

@@ -2,7 +2,10 @@
 
 kdeFramework {
   name = "attica";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+  };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qtbase ];
 }

pkgs/development/libraries/kde-frameworks/bluez-qt.nix

@@ -1,11 +1,14 @@
 { kdeFramework, lib
 , extra-cmake-modules
-, qtdeclarative
+, qtbase, qtdeclarative
 }:
 
 kdeFramework {
   name = "bluez-qt";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+  };
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ qtdeclarative ];
   preConfigure = ''

pkgs/development/libraries/kde-frameworks/karchive.nix

@@ -2,7 +2,10 @@
 
 kdeFramework {
   name = "karchive";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+  };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qtbase ];
 }

pkgs/development/libraries/kde-frameworks/kcodecs.nix

@@ -2,7 +2,10 @@
 
 kdeFramework {
   name = "kcodecs";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+  };
   nativeBuildInputs = [ extra-cmake-modules qttools ];
   buildInputs = [ qtbase ];
 }

pkgs/development/libraries/kde-frameworks/kconfig.nix

@@ -2,7 +2,10 @@
 
 kdeFramework {
   name = "kconfig";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+  };
   nativeBuildInputs = [ extra-cmake-modules qttools ];
   buildInputs = [ qtbase ];
 }

pkgs/development/libraries/kde-frameworks/kcoreaddons.nix

@@ -2,7 +2,10 @@
 
 kdeFramework {
   name = "kcoreaddons";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+  };
   nativeBuildInputs = [ extra-cmake-modules qttools ];
   buildInputs = [ qtbase ];
   propagatedBuildInputs = [ shared_mime_info ];

pkgs/development/libraries/kde-frameworks/kdbusaddons.nix

@@ -1,8 +1,11 @@
-{ kdeFramework, lib, extra-cmake-modules, qttools, qtx11extras }:
+{ kdeFramework, lib, extra-cmake-modules, qtbase, qttools, qtx11extras }:
 
 kdeFramework {
   name = "kdbusaddons";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+  };
   nativeBuildInputs = [ extra-cmake-modules qttools ];
   propagatedBuildInputs = [ qtx11extras ];
 }

pkgs/development/libraries/kde-frameworks/kdnssd.nix

@@ -5,7 +5,10 @@
 
 kdeFramework {
   name = "kdnssd";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+  };
   nativeBuildInputs = [ extra-cmake-modules qttools ];
   propagatedBuildInputs = [ avahi ];
   buildInputs = [ qtbase ];

pkgs/development/libraries/kde-frameworks/kguiaddons.nix

@@ -1,11 +1,15 @@
-{ kdeFramework, lib
+{
-, extra-cmake-modules
+  kdeFramework, lib,
-, qtx11extras
+  extra-cmake-modules,
+  qtbase, qtx11extras,
 }:
 
 kdeFramework {
   name = "kguiaddons";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+  };
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ qtx11extras ];
 }

pkgs/development/libraries/kde-frameworks/ki18n.nix

@@ -1,15 +1,16 @@
-{ kdeFramework, lib
+{
-, extra-cmake-modules
+  kdeFramework, lib,
-, gettext
+  extra-cmake-modules, gettext, python,
-, python
+  qtbase, qtdeclarative, qtscript,
-, qtdeclarative
-, qtscript
 }:
 
 kdeFramework {
   name = "ki18n";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+  };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ qtdeclarative qtscript ];
   propagatedNativeBuildInputs = [ gettext python ];
+  propagatedBuildInputs = [ qtdeclarative qtscript ];
 }

pkgs/development/libraries/kde-frameworks/kidletime.nix

@@ -6,7 +6,10 @@
 
 kdeFramework {
   name = "kidletime";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+  };
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ qtbase qtx11extras ];
 }

pkgs/development/libraries/kde-frameworks/kitemmodels.nix

@@ -4,7 +4,10 @@
 
 kdeFramework {
   name = "kitemmodels";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+  };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qtbase ];
 }

pkgs/development/libraries/kde-frameworks/kitemviews.nix

@@ -4,7 +4,10 @@
 
 kdeFramework {
   name = "kitemviews";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+  };
   nativeBuildInputs = [ extra-cmake-modules qttools ];
   buildInputs = [ qtbase ];
 }

pkgs/development/libraries/kde-frameworks/kplotting.nix

@@ -4,7 +4,10 @@
 
 kdeFramework {
   name = "kplotting";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+  };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qtbase ];
 }

pkgs/development/libraries/kde-frameworks/kwayland.nix

@@ -1,15 +1,16 @@
-{ kdeFramework
+{
-, extra-cmake-modules
+  kdeFramework, lib,
-, qtbase, wayland
+  extra-cmake-modules,
+  qtbase, wayland
 }:
 
 kdeFramework {
   name = "kwayland";
-  nativeBuildInputs = [
+  meta = {
-    extra-cmake-modules
+    maintainers = [ lib.maintainers.ttuegel ];
-  ];
+    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+  };
+  nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qtbase ];
-  propagatedBuildInputs = [
+  propagatedBuildInputs = [ wayland ];
-    wayland
-  ];
 }

pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix

@@ -4,7 +4,10 @@
 
 kdeFramework {
   name = "kwidgetsaddons";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+  };
   nativeBuildInputs = [ extra-cmake-modules qttools ];
   buildInputs = [ qtbase ];
 }

pkgs/development/libraries/kde-frameworks/kwindowsystem.nix

@@ -1,11 +1,15 @@
-{ kdeFramework, lib
+{
-, extra-cmake-modules
+  kdeFramework, lib,
-, qttools, qtx11extras
+  extra-cmake-modules,
+  qtbase, qttools, qtx11extras
 }:
 
 kdeFramework {
   name = "kwindowsystem";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+  };
   nativeBuildInputs = [ extra-cmake-modules qttools ];
   propagatedBuildInputs = [ qtx11extras ];
 }

pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix

@@ -5,7 +5,10 @@
 
 kdeFramework {
   name = "modemmanager-qt";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+  };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qtbase ];
   propagatedBuildInputs = [ modemmanager ];

pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix

@@ -5,7 +5,10 @@
 
 kdeFramework {
   name = "networkmanager-qt";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+  };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qtbase ];
   propagatedBuildInputs = [ networkmanager ];

pkgs/development/libraries/kde-frameworks/solid.nix

@@ -1,12 +1,15 @@
 {
   kdeFramework, lib,
   bison, extra-cmake-modules, flex,
-  qtdeclarative, qttools
+  qtbase, qtdeclarative, qttools
 }:
 
 kdeFramework {
   name = "solid";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+  };
   nativeBuildInputs = [ bison extra-cmake-modules flex qttools ];
   propagatedBuildInputs = [ qtdeclarative ];
 }

pkgs/development/libraries/kde-frameworks/sonnet.nix

@@ -5,7 +5,10 @@
 
 kdeFramework {
   name = "sonnet";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+  };
   nativeBuildInputs = [ extra-cmake-modules qttools ];
   buildInputs = [ hunspell qtbase ];
 }

pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix

@@ -4,7 +4,10 @@
 
 kdeFramework {
   name = "syntax-highlighting";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+  };
   nativeBuildInputs = [ extra-cmake-modules perl qttools ];
   buildInputs = [ qtbase ];
 }

pkgs/development/libraries/kde-frameworks/threadweaver.nix

@@ -4,7 +4,10 @@
 
 kdeFramework {
   name = "threadweaver";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+  };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qtbase ];
 }

pkgs/tools/security/pinentry/qt5.nix

@@ -31,6 +31,8 @@ stdenv.mkDerivation rec {
     (mkEnable true "pinentry-qt")
   ];
 
+  NIX_CFLAGS_COMPILE = [ "-std=c++11" ];
+
   nativeBuildInputs = [ pkgconfig ];
 
   meta = {