Skip to content

Commit

Permalink
Merge pull request #2827 from haslersn/bugfix/nix-shell-checks
Browse files Browse the repository at this point in the history
shell.nix: Fix check for ./cbuild and add check for ./cbuild/mixxx
  • Loading branch information
uklotzde authored Jun 1, 2020
2 parents 30843da + 6db5b23 commit 9d127d2
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ let inherit (nixroot) stdenv pkgs lib
'';

shell-build = nixroot.writeShellScriptBin "build" ''
if [ -d "$cbuild" ]; then
if [ ! -d "cbuild" ]; then
>&2 echo "First you have to run configure."
exit 1
fi
Expand All @@ -59,11 +59,19 @@ let inherit (nixroot) stdenv pkgs lib
'';

shell-run = nixroot.writeShellScriptBin "run" ''
if [ ! -f "cbuild/mixxx" ]; then
>&2 echo "First you have to run build."
exit 1
fi
cd cbuild
./mixxx --resourcePath res/ "$@"
'';

shell-debug = nixroot.writeShellScriptBin "debug" ''
if [ ! -f "cbuild/mixxx" ]; then
>&2 echo "First you have to run build."
exit 1
fi
cd cbuild
gdb --args ./mixxx --resourcePath res/ "$@"
'';
Expand Down

0 comments on commit 9d127d2

Please sign in to comment.