From ecbb4bd632f1a2b71d8501b9dc7c57e6f06e9ad0 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sun, 21 Jun 2015 20:01:15 +0200
Subject: moved adjmix to user config

---
 bragi.nix              |  8 --------
 users/gkleen@bragi.nix | 22 ++++++++++++++--------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/bragi.nix b/bragi.nix
index 70984a71..f3d48665 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -45,14 +45,6 @@ in {
               --set JACK_PROMISCUOUS_SERVER 1
           '';
         };
-      adjmix = let trivmix = customizedHaskellPackages.trivmix; in
-        pkgs.stdenv.mkDerivation {
-          name = "adjmix";
-          buildCommand = ''
-            mkdir -p $out/bin
-            cp ${trivmix}/bin/adjmix $out/bin
-          '';
-        };
       jack2 = pkgs.callPackage ./customized/jack2.nix {};
       mpd = pkgs.callPackage ./customized/mpd.nix {
         gmeSupport = false;
diff --git a/users/gkleen@bragi.nix b/users/gkleen@bragi.nix
index 27d872ad..452f0d83 100644
--- a/users/gkleen@bragi.nix
+++ b/users/gkleen@bragi.nix
@@ -31,17 +31,14 @@
     myHaskellPackages = pkgs.recurseIntoAttrs (
       pkgs.haskellPackages.override {
         extension = self: super: let
-          callPackage = pkgs.lib.callPackageWith self;
+          callPackage = pkgs.lib.callPackageWith (self // pkgs);
         in {
           attoparsecExpr = callPackage ../custom/attoparsec-expr.nix {};
           shellMonad = callPackage ../custom/shell-monad.nix {};
-          beuteltier = callPackage ../custom/beuteltier.nix { fetchgit = pkgs.fetchgit; };
-          opossum = callPackage ../custom/opossum.nix { fetchgit = pkgs.fetchgit; };
-          opossumWrapper = callPackage ../custom/opossum-wrapper.nix {
-            stdenv = pkgs.stdenv;
-            makeWrapper = pkgs.makeWrapper;
-          };
-          wombat = callPackage ../custom/wombat.nix { fetchgit = pkgs.fetchgit; };
+          beuteltier = callPackage ../custom/beuteltier.nix {};
+          opossum = callPackage ../custom/opossum.nix {};
+          opossumWrapper = callPackage ../custom/opossum-wrapper.nix {};
+          wombat = callPackage ../custom/wombat.nix {};
           wombatWrapper = pkgs.stdenv.mkDerivation {
             name = "wombat-wrapper";
             src = self.wombat;
@@ -57,6 +54,7 @@
                 --prefix PATH : ${pkgs.youtube-dl}/bin
             '';
           };
+          trivmix = callPackage ../custom/trivmix.nix {};
         };
       }
     );
@@ -64,5 +62,13 @@
       wombat = myHaskellPackages.wombatWrapper;
       opossum = myHaskellPackages.opossumWrapper;
     };
+    adjmix = let trivmix = customizedHaskellPackages.trivmix; in
+      pkgs.stdenv.mkDerivation {
+        name = "adjmix";
+        buildCommand = ''
+          mkdir -p $out/bin
+          cp ${trivmix}/bin/adjmix $out/bin
+        '';
+      };
   };
 }
-- 
cgit v1.2.3