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

treewide: NIX_*_COMPILE -> string

Browse Source
This commit is contained in:
Robin Gloster
2019-10-30 02:29:30 +01:00
committed by Jan Tojnar
parent ab0cfd9e03
commit 5f2b92e3ec
61 changed files with 73 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/python-modules/pivy/default.nix
View File

@@ -21,7 +21,7 @@ buildPythonPackage rec {
libXi libXext libSM libICE libX11
];
NIX_CFLAGS_COMPILE = [
NIX_CFLAGS_COMPILE = toString [
"-I${pkgs.qt5.qtbase.dev}/include/QtCore"
"-I${pkgs.qt5.qtbase.dev}/include/QtGui"
"-I${pkgs.qt5.qtbase.dev}/include/QtOpenGL"

5
pkgs/development/python-modules/protobuf/default.nix
View File

@@ -9,10 +9,11 @@ buildPythonPackage {
inherit disabled;
doCheck = doCheck && !isPy27; # setuptools>=41.4 no longer collects correctly on python2
NIX_CFLAGS_COMPILE =
NIX_CFLAGS_COMPILE = toString (
# work around python distutils compiling C++ with $CC
optional stdenv.isDarwin "-I${libcxx}/include/c++/v1"
++ optional (versionOlder protobuf.version "2.7.0") "-std=c++98";
++ optional (versionOlder protobuf.version "2.7.0") "-std=c++98"
);
propagatedBuildInputs = [ google_apputils ];
propagatedNativeBuildInputs = [ protobuf ]; # For protoc.