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

treewide: drop conditional makeFlag for darwin when specifiying cross-compiler

Browse Source
This commit is contained in:
Ben Siraphob 2021-02-16 18:51:23 +07:00
parent 223f25cf4a
commit 4b2c44c0a7
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/mosml/default.nix
View File

@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
buildInputs = [ gmp perl ];
makeFlags = [ "PREFIX=$(out)" ] ++ lib.optionals stdenv.isDarwin [ "CC=${stdenv.cc.targetPrefix}cc" ];
makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" ];
src = fetchurl {
url = "https://github.com/kfl/mosml/archive/ver-${version}.tar.gz";

4
pkgs/games/crawl/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, which, sqlite, lua5_1, perl, python3, zlib, pkg-config, ncurses
, dejavu_fonts, libpng, SDL2, SDL2_image, SDL2_mixer, libGLU, libGL, freetype, pngcrush, advancecomp
, tileMode ? false, enableSound ? tileMode
, tileMode ? false, enableSound ? tileMode, buildPackages
# MacOS / Darwin builds
, darwin ? null
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
fontsPath = lib.optionalString tileMode dejavu_fonts;
makeFlags = [ "prefix=${placeholder "out"}" "FORCE_CC=${stdenv.cc.targetPrefix}cc" "FORCE_CXX=${stdenv.cc.targetPrefix}c++" "HOSTCXX=${stdenv.cc.targetPrefix}c++"
makeFlags = [ "prefix=${placeholder "out"}" "FORCE_CC=${stdenv.cc.targetPrefix}cc" "FORCE_CXX=${stdenv.cc.targetPrefix}c++" "HOSTCXX=${buildPackages.stdenv.cc.targetPrefix}c++"
"FORCE_PKGCONFIG=y"
"SAVEDIR=~/.crawl" "sqlite=${sqlite.dev}"
"DATADIR=${placeholder "out"}"

2
pkgs/tools/compression/hactool/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
mv config.mk.template config.mk
'';
makeFlags = lib.optionals stdenv.isDarwin [ "CC=${stdenv.cc.targetPrefix}cc" ];
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
installPhase = ''
install -D hactool $out/bin/hactool

2
pkgs/tools/networking/haproxy/default.nix
View File

@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
"USE_GETADDRINFO=1"
] ++ lib.optionals withPrometheusExporter [
"EXTRA_OBJS=contrib/prometheus-exporter/service-prometheus.o"
] ++ lib.optional stdenv.isDarwin "CC=${stdenv.cc.targetPrefix}cc";
] ++ [ "CC=${stdenv.cc.targetPrefix}cc" ];
enableParallelBuilding = true;

2
pkgs/tools/security/apg/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
configurePhase = ''
substituteInPlace Makefile --replace /usr/local "$out"
'';
makeFlags = lib.optionals stdenv.isDarwin ["CC=${stdenv.cc.targetPrefix}cc"];
makeFlags = ["CC=${stdenv.cc.targetPrefix}cc"];
patches = [
./apg.patch

2
pkgs/tools/text/boxes/default.nix
View File

@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
"GLOBALCONF=${placeholder "out"}/share/boxes/boxes-config"
'';
makeFlags = lib.optionals stdenv.isDarwin [ "CC=${stdenv.cc.targetPrefix}cc" ];
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
installPhase = ''
install -Dm755 -t $out/bin src/boxes