diff options
author | lassulus <lassulus@lassul.us> | 2017-07-17 08:02:01 +0200 |
---|---|---|
committer | lassulus <lassulus@lassul.us> | 2017-07-17 08:02:01 +0200 |
commit | ae5fef979de5f0c5c8c1e78f56ddc1f8b4caf5b2 (patch) | |
tree | 2aea66950046fd3a6bce059e19ce0536a3e8331f /makefu/1systems/wbob | |
parent | 2d6447d9669ba74780a57dd4ddcdb19110bd4928 (diff) | |
parent | a3f6c2e49d37eb8d629cac1e8365d5b90a2ccd3c (diff) |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems/wbob')
-rw-r--r-- | makefu/1systems/wbob/config.nix | 2 | ||||
-rw-r--r-- | makefu/1systems/wbob/source.nix | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/makefu/1systems/wbob/config.nix b/makefu/1systems/wbob/config.nix index c530aaad3..d7f642360 100644 --- a/makefu/1systems/wbob/config.nix +++ b/makefu/1systems/wbob/config.nix @@ -20,7 +20,7 @@ in { # <stockholm/makefu/2configs/gui/wbob-kiosk.nix> <stockholm/makefu/2configs/stats/client.nix> - <stockholm/makefu/2configs/gui/studio.nix> + <stockholm/makefu/2configs/gui/studio-virtual.nix> <stockholm/makefu/2configs/audio/jack-on-pulse.nix> <stockholm/makefu/2configs/audio/realtime-audio.nix> <stockholm/makefu/2configs/vncserver.nix> diff --git a/makefu/1systems/wbob/source.nix b/makefu/1systems/wbob/source.nix index 419ebbe3b..af0f37809 100644 --- a/makefu/1systems/wbob/source.nix +++ b/makefu/1systems/wbob/source.nix @@ -1,3 +1,7 @@ import <stockholm/makefu/source.nix> { - name="wbob"; + name="studio"; + override.musnix.git = { + url = https://github.com/musnix/musnix.git; + ref = "d8b989f"; + }; } |