openspades: less hacks
This commit is contained in:
parent
a7fe84e38a
commit
c7193c1506
|
@ -58,8 +58,13 @@ stdenv.mkDerivation {
|
|||
''}
|
||||
|
||||
configureFlagsArray=( --enable-shared --with-threads
|
||||
<<<<<<< Updated upstream
|
||||
CPPFLAGS="${concatStringsSep " " (map (p: "-I${p.dev or p}/include") buildInputs)}"
|
||||
LDFLAGS="${concatStringsSep " " (map (p: "-L${p.lib or (p.out or p)}/lib") buildInputs)}"
|
||||
=======
|
||||
CPPFLAGS="${concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs)}"
|
||||
LDFLAGS="${concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs)}"
|
||||
>>>>>>> Stashed changes
|
||||
LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"
|
||||
)
|
||||
'';
|
||||
|
|
|
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
|||
[ cmake curl glew makeWrapper mesa SDL2 SDL2_image unzip wget zlib ]
|
||||
++ lib.optional withOpenal openal;
|
||||
|
||||
cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DOPENSPADES_INSTALL_BINARY=bin" ];
|
||||
cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DOPENSPADES_INSTALL_BINARY=bin" "-DOPENSPADES_RESOURCES=NO" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
@ -33,8 +33,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
preBuild = ''
|
||||
cp $devPack Resources/DevPaks27.zip
|
||||
unzip -u -o Resources/DevPaks27.zip -d Resources/DevPak
|
||||
unzip -u -o $devPack -d Resources/DevPak
|
||||
'';
|
||||
|
||||
NIX_CFLAGS_LINK = lib.optional withOpenal "-lopenal";
|
||||
|
|
Loading…
Reference in a new issue