diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-09-08 00:46:04 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-09-16 22:13:21 +0000 |
| commit | afcf2d55332c5c01c2d989e9d010577d257cb6cc (patch) | |
| tree | e1c816a271686b014a6403bcad7c57dd2ee4d9c7 /nixpkgs/pkgs/development/libraries/grantlee/5 | |
| parent | 175b9acd282aaf65b5f354ea6e95c1348fe3daa3 (diff) | |
| parent | 4e60699fa727e4a0f9a3e78948012f86da32cfef (diff) | |
| download | nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.gz nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.bz2 nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.lz nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.xz nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.zst nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.zip | |
Merge commit '4e60699fa727e4a0f9a3e78948012f86da32cfef'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/grantlee/5')
3 files changed, 28 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/libraries/grantlee/5/default.nix b/nixpkgs/pkgs/development/libraries/grantlee/5/default.nix index 52c087b19147..45096e031d37 100644 --- a/nixpkgs/pkgs/development/libraries/grantlee/5/default.nix +++ b/nixpkgs/pkgs/development/libraries/grantlee/5/default.nix @@ -1,15 +1,14 @@ { mkDerivation, lib, copyPathsToStore, fetchurl, qtbase, qtscript, cmake }: mkDerivation rec { - name = "grantlee-${version}"; + 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"; sha256 = "1lf9rkv0i0kd7fvpgg5l8jb87zw8dzcwd1liv6hji7g4wlpmfdiq"; - name = "${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; }; buildInputs = [ qtbase qtscript ]; diff --git a/nixpkgs/pkgs/development/libraries/grantlee/5/grantlee-cxx11.patch b/nixpkgs/pkgs/development/libraries/grantlee/5/grantlee-cxx11.patch new file mode 100644 index 000000000000..d049d6c96f81 --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/grantlee/5/series b/nixpkgs/pkgs/development/libraries/grantlee/5/series index 9c4015a1c197..19850b2e7e43 100644 --- a/nixpkgs/pkgs/development/libraries/grantlee/5/series +++ b/nixpkgs/pkgs/development/libraries/grantlee/5/series @@ -1,2 +1,3 @@ grantlee-nix-profiles.patch grantlee-no-canonicalize-filepath.patch +grantlee-cxx11.patch |