openspades-git: drop yet another hack, fix accidential python merge
This commit is contained in:
parent
628c8e8995
commit
2d57767974
|
@ -58,13 +58,8 @@ 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"}"
|
||||
)
|
||||
'';
|
||||
|
|
|
@ -29,7 +29,6 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
preBuild = ''
|
||||
cat > Resources/downloadpak.sh
|
||||
unzip -u -o $devPack -d Resources/DevPak
|
||||
'';
|
||||
|
||||
|
|
Loading…
Reference in a new issue