From 571cae88e8beaebaa46407bfe855830299ff72fe Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Wed, 17 Jun 2015 14:57:40 +0200 Subject: moved runOpossum out of haskellPackages --- users/gkleen@bragi.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'users/gkleen@bragi.nix') diff --git a/users/gkleen@bragi.nix b/users/gkleen@bragi.nix index b749c548..aab73f7b 100644 --- a/users/gkleen@bragi.nix +++ b/users/gkleen@bragi.nix @@ -1,4 +1,4 @@ -{ +rec { packageOverrides = pkgs: { mpv = let mpv = pkgs.mpv.override { youtubeSupport = true; theoraSupport = true; }; in pkgs.stdenv.mkDerivation { name = "mpv-wrapper"; @@ -57,17 +57,12 @@ --prefix PATH : ${pkgs.youtube-dl}/bin ''; }; - runOpossum = callPackage ../custom/run-opossum_bragi.nix { - stdenv = pkgs.stdenv; - zsh = pkgs.zsh; - findutils = pkgs.findutils; - coreutils = pkgs.coreutils; - wombat = self.wombatWrapper; - opossum = self.opossumWrapper; - makeWrapper = pkgs.makeWrapper; - }; }; } ); + runOpossum = pkgs.callPackage ../custom/run-opossum_bragi.nix { + wombat = myHaskellPackages.wombatWrapper; + opossum = myHaskellPackages.opossumWrapper; + }; }; } -- cgit v1.2.3