git.iko.soy/typeable/nixpkgs
on master help sign in
treewide: drop conditional makeFlag for darwin when specifiying cross-compiler
commit4b2c44c0a7ad50207c43e286e7946715b985a188 authorBen Siraphob <bensiraphob@gmail.com> dateTue 16 Feb 2021, 18:51 (6 years ago) parent223f25c
6 files changed+7−7
pkgs/development/compilers/mosml/default.nix+1−1 pkgs/games/crawl/default.nix+2−2 pkgs/tools/compression/hactool/default.nix+1−1 pkgs/tools/networking/haproxy/default.nix+1−1 pkgs/tools/security/apg/default.nix+1−1 pkgs/tools/text/boxes/default.nix+1−1
pkgs/development/compilers/mosml/default.nix+1−1
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
66
77 buildInputs = [ gmp perl ];
88
9− makeFlags = [ "PREFIX=$(out)" ] ++ lib.optionals stdenv.isDarwin [ "CC=${stdenv.cc.targetPrefix}cc" ];
9+ makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" ];
1010
1111 src = fetchurl {
1212 url = "https://github.com/kfl/mosml/archive/ver-${version}.tar.gz";
pkgs/games/crawl/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, lib, fetchFromGitHub, fetchpatch, which, sqlite, lua5_1, perl, python3, zlib, pkg-config, ncurses
22, dejavu_fonts, libpng, SDL2, SDL2_image, SDL2_mixer, libGLU, libGL, freetype, pngcrush, advancecomp
3−, tileMode ? false, enableSound ? tileMode
3+, tileMode ? false, enableSound ? tileMode, buildPackages
44
55# MacOS / Darwin builds
66, darwin ? null
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
4444
4545 fontsPath = lib.optionalString tileMode dejavu_fonts;
4646
47− makeFlags = [ "prefix=${placeholder "out"}" "FORCE_CC=${stdenv.cc.targetPrefix}cc" "FORCE_CXX=${stdenv.cc.targetPrefix}c++" "HOSTCXX=${stdenv.cc.targetPrefix}c++"
47+ makeFlags = [ "prefix=${placeholder "out"}" "FORCE_CC=${stdenv.cc.targetPrefix}cc" "FORCE_CXX=${stdenv.cc.targetPrefix}c++" "HOSTCXX=${buildPackages.stdenv.cc.targetPrefix}c++"
4848 "FORCE_PKGCONFIG=y"
4949 "SAVEDIR=~/.crawl" "sqlite=${sqlite.dev}"
5050 "DATADIR=${placeholder "out"}"
pkgs/tools/compression/hactool/default.nix+1−1
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 mv config.mk.template config.mk
1616 '';
1717
18− makeFlags = lib.optionals stdenv.isDarwin [ "CC=${stdenv.cc.targetPrefix}cc" ];
18+ makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
1919
2020 installPhase = ''
2121 install -D hactool $out/bin/hactool
pkgs/tools/networking/haproxy/default.nix+1−1
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
4747 "USE_GETADDRINFO=1"
4848 ] ++ lib.optionals withPrometheusExporter [
4949 "EXTRA_OBJS=contrib/prometheus-exporter/service-prometheus.o"
50− ] ++ lib.optional stdenv.isDarwin "CC=${stdenv.cc.targetPrefix}cc";
50+ ] ++ [ "CC=${stdenv.cc.targetPrefix}cc" ];
5151
5252 enableParallelBuilding = true;
5353
pkgs/tools/security/apg/default.nix+1−1
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88 configurePhase = ''
99 substituteInPlace Makefile --replace /usr/local "$out"
1010 '';
11− makeFlags = lib.optionals stdenv.isDarwin ["CC=${stdenv.cc.targetPrefix}cc"];
11+ makeFlags = ["CC=${stdenv.cc.targetPrefix}cc"];
1212
1313 patches = [
1414 ./apg.patch
pkgs/tools/text/boxes/default.nix+1−1
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525 "GLOBALCONF=${placeholder "out"}/share/boxes/boxes-config"
2626 '';
2727
28− makeFlags = lib.optionals stdenv.isDarwin [ "CC=${stdenv.cc.targetPrefix}cc" ];
28+ makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
2929
3030 installPhase = ''
3131 install -Dm755 -t $out/bin src/boxes