diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2019-08-22 13:19:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-22 13:19:11 -0500 |
| commit | 84a91208a948be5eca97ea182c4256d9d6ecf171 (patch) | |
| tree | 3549e83e53626f1b0b8299066fb19940d9b61887 /pkgs/development | |
| parent | 1e2ad9e6bc55a399396809fc0685c148efd371ae (diff) | |
| parent | 405f6a29cac459ad879d851e01291131058e7d54 (diff) | |
| download | nixpkgs-84a91208a948be5eca97ea182c4256d9d6ecf171.tar nixpkgs-84a91208a948be5eca97ea182c4256d9d6ecf171.tar.gz nixpkgs-84a91208a948be5eca97ea182c4256d9d6ecf171.tar.bz2 nixpkgs-84a91208a948be5eca97ea182c4256d9d6ecf171.tar.lz nixpkgs-84a91208a948be5eca97ea182c4256d9d6ecf171.tar.xz nixpkgs-84a91208a948be5eca97ea182c4256d9d6ecf171.tar.zst nixpkgs-84a91208a948be5eca97ea182c4256d9d6ecf171.zip | |
Merge pull request #67245 from nyanloutre/fix_kde_update
kde: multiple staging fixes
Diffstat (limited to 'pkgs/development')
4 files changed, 29 insertions, 2 deletions
diff --git a/pkgs/development/libraries/grantlee/5/default.nix b/pkgs/development/libraries/grantlee/5/default.nix index 3b14efe8a5f..45096e031d3 100644 --- a/pkgs/development/libraries/grantlee/5/default.nix +++ b/pkgs/development/libraries/grantlee/5/default.nix @@ -3,8 +3,7 @@ mkDerivation rec { pname = "grantlee"; version = "5.1.0"; - grantleeCompatVersion = "5.1"; - grantleePluginPrefix = "lib/grantlee/${grantleeCompatVersion}"; + grantleePluginPrefix = "lib/grantlee/${lib.versions.majorMinor version}"; src = fetchurl { url = "https://github.com/steveire/grantlee/archive/v${version}.tar.gz"; diff --git a/pkgs/development/libraries/grantlee/5/grantlee-cxx11.patch b/pkgs/development/libraries/grantlee/5/grantlee-cxx11.patch new file mode 100644 index 00000000000..d049d6c96f8 --- /dev/null +++ b/pkgs/development/libraries/grantlee/5/grantlee-cxx11.patch @@ -0,0 +1,24 @@ +From 3a5fc7662da3261be6496611900c095844e56ab1 Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid <aacid@kde.org> +Date: Sat, 20 Jul 2019 17:35:30 +0200 +Subject: [PATCH] Fix compile with newer Qt/cmake combination + +Without this i get huge errors about Qt needing C++11 support +--- + CMakeLists.txt | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6d51110..0859788 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -11,6 +11,9 @@ endif() + + project(Grantlee) + ++set (CMAKE_CXX_STANDARD 11) ++set (CMAKE_CXX_EXTENSIONS OFF) ++ + # Workaround for http://public.kitware.com/Bug/view.php?id=12301 + if (MINGW) + if(NOT CMAKE_BUILD_TYPE) diff --git a/pkgs/development/libraries/grantlee/5/series b/pkgs/development/libraries/grantlee/5/series index 9c4015a1c19..19850b2e7e4 100644 --- a/pkgs/development/libraries/grantlee/5/series +++ b/pkgs/development/libraries/grantlee/5/series @@ -1,2 +1,3 @@ grantlee-nix-profiles.patch grantlee-no-canonicalize-filepath.patch +grantlee-cxx11.patch diff --git a/pkgs/development/libraries/kde-frameworks/kdewebkit.nix b/pkgs/development/libraries/kde-frameworks/kdewebkit.nix index b7dcfb7fe64..9f682b44975 100644 --- a/pkgs/development/libraries/kde-frameworks/kdewebkit.nix +++ b/pkgs/development/libraries/kde-frameworks/kdewebkit.nix @@ -8,4 +8,7 @@ mkDerivation { buildInputs = [ kconfig kcoreaddons kio kparts ]; propagatedBuildInputs = [ qtwebkit ]; outputs = [ "out" "dev" ]; + cmakeFlags = [ + "-DBUILD_DESIGNERPLUGIN=OFF" + ]; } |