Merge pull request #9026 from abbradar/adom

Minor fixes for ADOM
This commit is contained in:
Arseniy Seroka 2015-07-29 00:35:11 +03:00
commit 81fd248056

View File

@ -1,8 +1,7 @@
{ stdenv, patchelf, zlib, libmad, libpng12, libcaca, mesa, alsaLib, libpulseaudio
, xlibs, plowshare }:
assert stdenv.isLinux;
{ stdenv, fetchurl, patchelf, zlib, libmad, libpng12, libcaca, mesa, alsaLib, libpulseaudio
, xlibs }:
assert stdenv.system == "x86_64-linux";
let
inherit (xlibs) libXext libX11;
@ -11,21 +10,13 @@ let
zlib libmad libpng12 libcaca libXext libX11 mesa alsaLib libpulseaudio];
in
assert stdenv.is64bit;
stdenv.mkDerivation rec {
name = "adom-${version}-noteye";
version = "1.2.0_pre23";
name = "adom-1.2.0-noteye";
# couldn't make fetchurl appear non-robot, even with --user-agent
src = stdenv.mkDerivation {
name = "adom-1.2.0-noteye.tar.gz";
buildCommand = ''
${plowshare}/bin/plowdown "http://www30.zippyshare.com/v/39200582/file.html"
F=`ls *tar.gz`
mv $F $out
'';
outputHashAlgo = "sha256";
outputHash = "1f825845d5007e676a4d1a3ccd887904b959bdddbcb9f241c42c2dac34037669";
src = fetchurl {
url = "http://ancardia.uk.to/download/adom_noteye_linux_ubuntu_64_${version}.tar.gz";
sha256 = "0sbn0csaqb9cqi0z5fdwvnymkf84g64csg0s9mm6fzh0sm2mi0hz";
};
buildCommand = ''
@ -52,7 +43,7 @@ stdenv.mkDerivation rec {
mkdir $out/bin
cat >$out/bin/adom <<EOF
#! ${stdenv.shell}
(cd $out; $out/adom ; )
(cd $out; exec $out/adom ; )
EOF
chmod +x $out/bin/adom
'';