JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #74293 from tobim/pkgs/cmake

Browse Source 
cmake: 3.15.4 -> 3.16.2
This commit is contained in:
Jan Tojnar 2019-12-20 17:12:47 +01:00 committed by GitHub
commit 8a8e662be2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/quickder/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, python2Packages, hexio { stdenv, fetchFromGitHub, python2Packages, hexio
, which, cmake, bash, arpa2cm, git, asn2quickder, pkgconfig }: , cmake, bash, arpa2cm, git, asn2quickder }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "quickder"; pname = "quickder";
@ -12,20 +12,17 @@ stdenv.mkDerivation rec {
repo = "quick-der"; repo = "quick-der";
}; };
nativeBuildInputs = [ cmake ];
buildInputs = with python2Packages; [ buildInputs = with python2Packages; [
arpa2cm arpa2cm
asn1ate asn1ate
bash
cmake
git
hexio hexio
pyparsing pyparsing
python python
six six
which
asn1ate asn1ate
asn2quickder asn2quickder
pkgconfig
]; ];
postPatch = '' postPatch = ''
@ -39,9 +36,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
"-DNO_TESTING=ON" "-DNO_TESTING=ON"
"-DARPA2CM_TOOLCHAIN_DIR=$out/share/ARPA2CM/toolchain/" "-DARPA2CM_TOOLCHAIN_DIR=$out/share/ARPA2CM/toolchain/"
"-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON"
"-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON"
"-DPACKAGE_NO_PACKAGE_REGISTRY=ON"
]; ];
preConfigure = '' preConfigure = ''

4
pkgs/development/tools/build-managers/cmake/application-services.patch
View File

@ -23,12 +23,12 @@ index e353a37..b06f842 100644
struct cmLinkImplementation; struct cmLinkImplementation;
-#if defined(CMAKE_BUILD_WITH_CMAKE) && defined(__APPLE__) -#if !defined(CMAKE_BOOTSTRAP) && defined(__APPLE__)
-# define HAVE_APPLICATION_SERVICES -# define HAVE_APPLICATION_SERVICES
-# include <ApplicationServices/ApplicationServices.h> -# include <ApplicationServices/ApplicationServices.h>
-#endif -#endif
- -
#if defined(CMAKE_BUILD_WITH_CMAKE) #if !defined(CMAKE_BOOTSTRAP)
# include "cmXMLParser.h" # include "cmXMLParser.h"
diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt

12
pkgs/development/tools/build-managers/cmake/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, fetchpatch, pkgconfig { stdenv, lib, fetchurl, pkgconfig
, bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash , bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash
, buildPackages , buildPackages
# darwin attributes # darwin attributes
@ -19,12 +19,12 @@ stdenv.mkDerivation rec {
+ lib.optionalString useNcurses "-cursesUI" + lib.optionalString useNcurses "-cursesUI"
+ lib.optionalString withQt5 "-qt5UI" + lib.optionalString withQt5 "-qt5UI"
+ lib.optionalString useQt4 "-qt4UI"; + lib.optionalString useQt4 "-qt4UI";
version = "3.15.5"; version = "3.16.2";
src = fetchurl { src = fetchurl {
url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz";
# compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt
sha256 = "1d5y8d92axcc6rfqlsxamayfs3fc1vdby91hn5mx1kn02ppprpgv"; sha256 = "1ag65ignli58kpmji6gjhj8xw4w1qdr910i99hsvx8hcqrp7h2cc";
}; };
patches = [ patches = [
@ -37,12 +37,6 @@ stdenv.mkDerivation rec {
# Derived from https://github.com/libuv/libuv/commit/1a5d4f08238dd532c3718e210078de1186a5920d # Derived from https://github.com/libuv/libuv/commit/1a5d4f08238dd532c3718e210078de1186a5920d
./libuv-application-services.patch ./libuv-application-services.patch
# Fix for harfbuzz with pango versions > 1.43.
# Should be removed with cmake >= 3.16
(fetchpatch {
url = "https://gitlab.kitware.com/cmake/cmake/commit/effafca77eacbb4988006b1f3f4d9154df6c33f8.diff";
sha256 = "0vxam5kka1dffygp1nd0g21ib9qk8kds8iprbfga2gimzyrlfmfr";
})
] ++ lib.optional stdenv.isCygwin ./3.2.2-cygwin.patch; ] ++ lib.optional stdenv.isCygwin ./3.2.2-cygwin.patch;
outputs = [ "out" ]; outputs = [ "out" ];

4
pkgs/development/tools/build-managers/cmake/libuv-application-services.patch
View File

@ -31,8 +31,8 @@ diff -ur cmake-3.12.1/Utilities/cmlibuv/src/unix/fsevents.c cmake-3.12.1-patched
#include "uv.h" #include "uv.h"
#include "internal.h" #include "internal.h"
-#if TARGET_OS_IPHONE -#if TARGET_OS_IPHONE || MAC_OS_X_VERSION_MAX_ALLOWED < 1070
+#if !HAVE_CORESERVICES_CORESERVICES_H +#if !HAVE_CORESERVICES_CORESERVICES_H || MAC_OS_X_VERSION_MAX_ALLOWED < 1070
/* iOS (currently) doesn't provide the FSEvents-API (nor CoreServices) */ /* iOS (currently) doesn't provide the FSEvents-API (nor CoreServices) */

4
pkgs/development/tools/build-managers/cmake/setup-hook.sh
View File

@ -96,8 +96,8 @@ cmakeConfigurePhase() {
# and unecessary attempts to access non-existent home folder # and unecessary attempts to access non-existent home folder
# https://cmake.org/cmake/help/latest/manual/cmake-packages.7.html#disabling-the-package-registry # https://cmake.org/cmake/help/latest/manual/cmake-packages.7.html#disabling-the-package-registry
cmakeFlags="-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON $cmakeFlags" cmakeFlags="-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON $cmakeFlags"
cmakeFlags="-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON $cmakeFlags" cmakeFlags="-DCMAKE_FIND_USE_PACKAGE_REGISTRY=OFF $cmakeFlags"
cmakeFlags="-DCMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY=ON $cmakeFlags" cmakeFlags="-DCMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY=OFF $cmakeFlags"
if [ "${buildPhase-}" = ninjaBuildPhase ]; then if [ "${buildPhase-}" = ninjaBuildPhase ]; then
cmakeFlags="-GNinja $cmakeFlags" cmakeFlags="-GNinja $cmakeFlags"