mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-26 04:43:09 +03:00
- libgcc_s seems to be needed after all
- eduke32 uses UNIX style options nowadays svn path=/nixpkgs/trunk/; revision=27937
This commit is contained in:
parent
f0e799a492
commit
bf5c3bb671
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||||||
++ stdenv.lib.optional (stdenv.system == "i686-linux") nasm;
|
++ stdenv.lib.optional (stdenv.system == "i686-linux") nasm;
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE = "-I${SDL}/include/SDL";
|
NIX_CFLAGS_COMPILE = "-I${SDL}/include/SDL";
|
||||||
NIX_LDFLAGS = "-L${SDL}/lib";
|
NIX_LDFLAGS = "-L${SDL}/lib -lgcc_s";
|
||||||
|
|
||||||
desktopItem = makeDesktopItem {
|
desktopItem = makeDesktopItem {
|
||||||
name = "eduke32";
|
name = "eduke32";
|
||||||
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
cd \$EDUKE32_DATA_DIR
|
cd \$EDUKE32_DATA_DIR
|
||||||
eduke32 /g\$EDUKE32_GRP_FILE
|
eduke32 -g \$EDUKE32_GRP_FILE
|
||||||
EOF
|
EOF
|
||||||
chmod 755 $out/bin/eduke32-wrapper
|
chmod 755 $out/bin/eduke32-wrapper
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user