mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-16 18:37:04 +03:00
kf57: use cmake-3.2
Build was broken by openssl update because older cmake could not parse openssl's version correctly.
This commit is contained in:
parent
7e21c519ba
commit
a17535822a
@ -72,8 +72,9 @@ let
|
|||||||
# packages from the nixpkgs collection
|
# packages from the nixpkgs collection
|
||||||
(with pkgs;
|
(with pkgs;
|
||||||
{
|
{
|
||||||
inherit cmake epoxy;
|
|
||||||
Boost = boost155;
|
Boost = boost155;
|
||||||
|
cmake = cmake-3_2;
|
||||||
|
inherit epoxy;
|
||||||
GIF = giflib;
|
GIF = giflib;
|
||||||
GLIB2 = glib;
|
GLIB2 = glib;
|
||||||
Gpgme = gpgme;
|
Gpgme = gpgme;
|
||||||
@ -105,7 +106,7 @@ let
|
|||||||
extra-cmake-modules = {
|
extra-cmake-modules = {
|
||||||
inherit (super.extra-cmake-modules) name src;
|
inherit (super.extra-cmake-modules) name src;
|
||||||
|
|
||||||
propagatedNativeBuildInputs = [ pkgs.cmake pkgs.pkgconfig qt5.tools ];
|
propagatedNativeBuildInputs = [ scope.cmake pkgs.pkgconfig qt5.tools ];
|
||||||
cmakeFlags = ["-DBUILD_TESTING=OFF"];
|
cmakeFlags = ["-DBUILD_TESTING=OFF"];
|
||||||
patches =
|
patches =
|
||||||
[
|
[
|
||||||
|
Loading…
Reference in New Issue
Block a user