diff options
author | Lluís Batlle i Rossell <viric@viric.name> | 2015-04-17 09:37:42 +0200 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@viric.name> | 2015-04-17 09:37:42 +0200 |
commit | 19a96c7c304ab35fb68a4d271517650cbff59f75 (patch) | |
tree | 6b59eef1cc4d391c16b4d18e1410c948b8673271 | |
parent | eaecd7ffd4af92915264b954f05a8dfcb7c21056 (diff) |
Adding alsa/pulseaudio to mikmod
I also write the sf urls with mirror://.
-rw-r--r-- | pkgs/applications/audio/mikmod/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/libmikmod/default.nix | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/applications/audio/mikmod/default.nix b/pkgs/applications/audio/mikmod/default.nix index 58a83dafe69fc..918b743fef7af 100644 --- a/pkgs/applications/audio/mikmod/default.nix +++ b/pkgs/applications/audio/mikmod/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, libmikmod, ncurses }: +{ stdenv, fetchurl, libmikmod, ncurses, alsaLib }: stdenv.mkDerivation rec { name = "mikmod-3.2.6"; src = fetchurl { - url = "http://downloads.sourceforge.net/project/mikmod/mikmod/3.2.6/mikmod-3.2.6.tar.gz"; + url = "mirror://sourceforge/mikmod/${name}.tar.gz"; sha256 = "0wr61raj10rpl64mk3x9g3rwys898fbzyg93c6mrz89nvc74wm04"; }; diff --git a/pkgs/development/libraries/libmikmod/default.nix b/pkgs/development/libraries/libmikmod/default.nix index 3e95f944caf46..2146562c5cb77 100644 --- a/pkgs/development/libraries/libmikmod/default.nix +++ b/pkgs/development/libraries/libmikmod/default.nix @@ -1,14 +1,18 @@ -{ stdenv, fetchurl, texinfo }: +{ stdenv, fetchurl, texinfo, alsaLib, pulseaudio }: stdenv.mkDerivation rec { name = "libmikmod-3.3.7"; - src = fetchurl { - url = "http://downloads.sourceforge.net/project/mikmod/libmikmod/3.3.7/libmikmod-3.3.7.tar.gz"; + url = "mirror://sourceforge/mikmod/${name}.tar.gz"; sha256 = "18nrkf5l50hfg0y50yxr7bvik9f002lhn8c00nbcp6dgm5011x2c"; }; - buildInputs = [ texinfo ]; + buildInputs = [ texinfo ] + ++ stdenv.lib.optional stdenv.isLinux [ alsaLib pulseaudio ]; + propagatedBuildInputs = + stdenv.lib.optional stdenv.isLinux pulseaudio; + + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lasound"; meta = with stdenv.lib; { description = "A library for playing tracker music module files"; |