summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bragi.nix8
-rw-r--r--users/gkleen@bragi.nix22
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 {
45 --set JACK_PROMISCUOUS_SERVER 1 45 --set JACK_PROMISCUOUS_SERVER 1
46 ''; 46 '';
47 }; 47 };
48 adjmix = let trivmix = customizedHaskellPackages.trivmix; in
49 pkgs.stdenv.mkDerivation {
50 name = "adjmix";
51 buildCommand = ''
52 mkdir -p $out/bin
53 cp ${trivmix}/bin/adjmix $out/bin
54 '';
55 };
56 jack2 = pkgs.callPackage ./customized/jack2.nix {}; 48 jack2 = pkgs.callPackage ./customized/jack2.nix {};
57 mpd = pkgs.callPackage ./customized/mpd.nix { 49 mpd = pkgs.callPackage ./customized/mpd.nix {
58 gmeSupport = false; 50 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 @@
31 myHaskellPackages = pkgs.recurseIntoAttrs ( 31 myHaskellPackages = pkgs.recurseIntoAttrs (
32 pkgs.haskellPackages.override { 32 pkgs.haskellPackages.override {
33 extension = self: super: let 33 extension = self: super: let
34 callPackage = pkgs.lib.callPackageWith self; 34 callPackage = pkgs.lib.callPackageWith (self // pkgs);
35 in { 35 in {
36 attoparsecExpr = callPackage ../custom/attoparsec-expr.nix {}; 36 attoparsecExpr = callPackage ../custom/attoparsec-expr.nix {};
37 shellMonad = callPackage ../custom/shell-monad.nix {}; 37 shellMonad = callPackage ../custom/shell-monad.nix {};
38 beuteltier = callPackage ../custom/beuteltier.nix { fetchgit = pkgs.fetchgit; }; 38 beuteltier = callPackage ../custom/beuteltier.nix {};
39 opossum = callPackage ../custom/opossum.nix { fetchgit = pkgs.fetchgit; }; 39 opossum = callPackage ../custom/opossum.nix {};
40 opossumWrapper = callPackage ../custom/opossum-wrapper.nix { 40 opossumWrapper = callPackage ../custom/opossum-wrapper.nix {};
41 stdenv = pkgs.stdenv; 41 wombat = callPackage ../custom/wombat.nix {};
42 makeWrapper = pkgs.makeWrapper;
43 };
44 wombat = callPackage ../custom/wombat.nix { fetchgit = pkgs.fetchgit; };
45 wombatWrapper = pkgs.stdenv.mkDerivation { 42 wombatWrapper = pkgs.stdenv.mkDerivation {
46 name = "wombat-wrapper"; 43 name = "wombat-wrapper";
47 src = self.wombat; 44 src = self.wombat;
@@ -57,6 +54,7 @@
57 --prefix PATH : ${pkgs.youtube-dl}/bin 54 --prefix PATH : ${pkgs.youtube-dl}/bin
58 ''; 55 '';
59 }; 56 };
57 trivmix = callPackage ../custom/trivmix.nix {};
60 }; 58 };
61 } 59 }
62 ); 60 );
@@ -64,5 +62,13 @@
64 wombat = myHaskellPackages.wombatWrapper; 62 wombat = myHaskellPackages.wombatWrapper;
65 opossum = myHaskellPackages.opossumWrapper; 63 opossum = myHaskellPackages.opossumWrapper;
66 }; 64 };
65 adjmix = let trivmix = customizedHaskellPackages.trivmix; in
66 pkgs.stdenv.mkDerivation {
67 name = "adjmix";
68 buildCommand = ''
69 mkdir -p $out/bin
70 cp ${trivmix}/bin/adjmix $out/bin
71 '';
72 };
67 }; 73 };
68} 74}