public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests 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-20 01:02:08 +07:00
parent 223f25cf4a
commit 4b2c44c0a7
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/games/crawl/default.nix
+2 -2
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"}"