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

openspades: less hacks

Browse Source
This commit is contained in:
Nikolay Amiantov 2016-05-07 11:58:17 +03:00
parent a7fe84e38a
commit c7193c1506
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/interpreters/python/3.5/default.nix
View File

@ -58,8 +58,13 @@ stdenv.mkDerivation {
''} ''}
configureFlagsArray=( --enable-shared --with-threads configureFlagsArray=( --enable-shared --with-threads
<<<<<<< Updated upstream
CPPFLAGS="${concatStringsSep " " (map (p: "-I${p.dev or p}/include") buildInputs)}" 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)}" 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"}" LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"
) )
''; '';

5
pkgs/games/openspades/default.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
[ cmake curl glew makeWrapper mesa SDL2 SDL2_image unzip wget zlib ] [ cmake curl glew makeWrapper mesa SDL2 SDL2_image unzip wget zlib ]
++ lib.optional withOpenal openal; ++ 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; enableParallelBuilding = true;
@ -33,8 +33,7 @@ stdenv.mkDerivation rec {
}; };
preBuild = '' preBuild = ''
cp $devPack Resources/DevPaks27.zip unzip -u -o $devPack -d Resources/DevPak
unzip -u -o Resources/DevPaks27.zip -d Resources/DevPak
''; '';
NIX_CFLAGS_LINK = lib.optional withOpenal "-lopenal"; NIX_CFLAGS_LINK = lib.optional withOpenal "-lopenal";