diff options
author | Vladimír Čunát <v@cunat.cz> | 2019-09-04 11:00:56 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2019-09-04 11:00:56 +0200 |
commit | 4aad2947f8d680f18e5b01e115cf8cff22186998 (patch) | |
tree | a7a3d020efc6ec7be822bc06e08eca3ac311c9e2 /pkgs/applications/video/mplayer/default.nix | |
parent | 2c5835b09a1d4966756212902d36b1b8ab242da6 (diff) | |
parent | 1d8a3973f46a2d1360f855eaa0f3a19859771793 (diff) |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/applications/video/mplayer/default.nix')
-rw-r--r-- | pkgs/applications/video/mplayer/default.nix | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 28f734fa7ee7c..0afdbe047cc3c 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -59,20 +59,21 @@ let codecs_src = let dir = http://www.mplayerhq.hu/MPlayer/releases/codecs/; + version = "20071007"; in if stdenv.hostPlatform.system == "i686-linux" then fetchurl { - url = "${dir}/essential-20071007.tar.bz2"; + url = "${dir}/essential-${version}.tar.bz2"; sha256 = "18vls12n12rjw0mzw4pkp9vpcfmd1c21rzha19d7zil4hn7fs2ic"; } else if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "${dir}/essential-amd64-20071007.tar.bz2"; + url = "${dir}/essential-amd64-${version}.tar.bz2"; sha256 = "13xf5b92w1ra5hw00ck151lypbmnylrnznq9hhb0sj36z5wz290x"; } else if stdenv.hostPlatform.system == "powerpc-linux" then fetchurl { - url = "${dir}/essential-ppc-20071007.tar.bz2"; + url = "${dir}/essential-ppc-${version}.tar.bz2"; sha256 = "18mlj8dp4wnz42xbhdk1jlz2ygra6fbln9wyrcyvynxh96g1871z"; } else null; codecs = if codecs_src != null then stdenv.mkDerivation { - name = "MPlayer-codecs-essential-20071007"; + pname = "MPlayer-codecs-essential"; src = codecs_src; @@ -89,11 +90,12 @@ let in stdenv.mkDerivation { - name = "mplayer-1.3.0"; + pname = "mplayer"; + version = "1.4"; src = fetchurl { - url = "http://www.mplayerhq.hu/MPlayer/releases/MPlayer-1.3.0.tar.xz"; - sha256 = "0hwqn04bdknb2ic88xd75smffxx63scvz0zvwvjb56nqj9n89l1s"; + url = "http://www.mplayerhq.hu/MPlayer/releases/MPlayer-${version}.tar.xz"; + sha256 = "0j5mflr0wnklxsvnpmxvk704hscyn2785hvvihj2i3a7b3anwnc2"; }; prePatch = '' @@ -218,6 +220,6 @@ stdenv.mkDerivation { homepage = http://mplayerhq.hu; license = "GPL"; maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; }; } |