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

openspades-git: drop yet another hack, fix accidential python merge

Browse Source
This commit is contained in:
Nikolay Amiantov 2016-05-07 12:02:22 +03:00
parent 628c8e8995
commit 2d57767974
2 changed files with 0 additions and 6 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,13 +58,8 @@ 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"}"
) )
''; '';

1
pkgs/games/openspades/git.nix
View File

@ -29,7 +29,6 @@ stdenv.mkDerivation rec {
}; };
preBuild = '' preBuild = ''
cat > Resources/downloadpak.sh
unzip -u -o $devPack -d Resources/DevPak unzip -u -o $devPack -d Resources/DevPak
''; '';