moved runOpossum out of haskellPackages

2 files changed, 6 insertions, 11 deletions

diff --git a/custom/run-opossum_bragi.nix b/custom/run-opossum_bragi.nix
index 07ed37de..c1f7a4a9 100644
--- a/custom/run-opossum_bragi.nix
+++ b/custom/run-opossum_bragi.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   version = "0.0.0";
   buildInputs = [ makeWrapper ];
         src = builtins.toFile name ''
-    #!${zsh}/bin/zsh
+    #!/bin/zsh
 
     oversized() {
       l=$(du -BG -s -t 75 $BEUTEL | wc -l)
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;
+    };
   };
 }