From 44418457728ce6d98a400832ff13d43386e70537 Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Wed, 1 Feb 2017 20:17:01 +0100 Subject: [PATCH] streamlink won't build on -stable --- nix/.nixpkgs/config.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nix/.nixpkgs/config.nix b/nix/.nixpkgs/config.nix index 83ce115..de2d329 100644 --- a/nix/.nixpkgs/config.nix +++ b/nix/.nixpkgs/config.nix @@ -95,7 +95,7 @@ }; }); - streamlink = if builtins.hasAttr "streamlink" pkgs then (overrideOlder pkgs.streamlink (attrs: rec { + streamlink = overrideOlder pkgs.streamlink (attrs: rec { version = "0.3.0"; name = "streamlink-${version}"; @@ -105,7 +105,8 @@ rev = "${version}"; sha256 = "1bjih6y21vmjmsk3xvhgc1innymryklgylyvjrskqw610niai59j"; }; - })) else pkgs.callPackage ./streamlink.nix {}; + }); + streamer = if (hasAttr "streamlink" pkgs) then streamlink else pythonPackages.livestreamer; yscripts = pkgs.callPackage ../dotfiles/bin {}; @@ -153,7 +154,7 @@ ]; media = mkEnv "y-media" [ - streamlink + streamer py3.youtube-dl mpv aria2