summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2015-06-21 19:53:01 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2015-06-21 19:53:01 +0200
commitc3990d9b9ca34929fa23096af80d0c7635dc4835 (patch)
tree5186ca115be7a3f1853f0b5a891ba3666ef15905
parentb17b97d8bd8fd3ebf1576b04d936ef3fbe049221 (diff)
downloadnixos-c3990d9b9ca34929fa23096af80d0c7635dc4835.tar
nixos-c3990d9b9ca34929fa23096af80d0c7635dc4835.tar.gz
nixos-c3990d9b9ca34929fa23096af80d0c7635dc4835.tar.bz2
nixos-c3990d9b9ca34929fa23096af80d0c7635dc4835.tar.xz
nixos-c3990d9b9ca34929fa23096af80d0c7635dc4835.zip
Simplified adjmix
-rw-r--r--bragi.nix7
1 files changed, 2 insertions, 5 deletions
diff --git a/bragi.nix b/bragi.nix
index f61b5e5b..70984a71 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -47,13 +47,10 @@ in {
47 }; 47 };
48 adjmix = let trivmix = customizedHaskellPackages.trivmix; in 48 adjmix = let trivmix = customizedHaskellPackages.trivmix; in
49 pkgs.stdenv.mkDerivation { 49 pkgs.stdenv.mkDerivation {
50 name = "adjmix-wrapper"; 50 name = "adjmix";
51 nativeBuildInputs = [ pkgs.makeWrapper ];
52 buildCommand = '' 51 buildCommand = ''
53 mkdir -p $out/bin 52 mkdir -p $out/bin
54 makeWrapper ${trivmix}/bin/adjmix $out/bin/adjmix \ 53 cp ${trivmix}/bin/adjmix $out/bin
55 --run "umask 0" \
56 --set JACK_PROMISCUOUS_SERVER 1
57 ''; 54 '';
58 }; 55 };
59 jack2 = pkgs.callPackage ./customized/jack2.nix {}; 56 jack2 = pkgs.callPackage ./customized/jack2.nix {};