diff --git a/flake.nix b/flake.nix index 0789ff9..22f3aef 100644 --- a/flake.nix +++ b/flake.nix @@ -9,80 +9,68 @@ inputs.flake-utils.url = "github:numtide/flake-utils"; outputs = { self, nixpkgs, nixpkgs-bitwig, flake-utils }: - flake-utils.lib.eachDefaultSystem - (system: - let - pkgs = import nixpkgs - { - system = system; - config = { - allowUnfree = true; - }; - }; - pkgs-bitwig = import nixpkgs-bitwig - { - system = system; - config = { - allowUnfree = true; - }; - }; - in - { - packages.mopidyWithExtensions = pkgs.buildEnv { - name = "mopidy-with-extensions-${pkgs.mopidy.version}"; - paths = pkgs.lib.closePropagation (with pkgs; [ - mopidy-iris - mopidy-local - mopidy-mpd - ]); - pathsToLink = [ "/${pkgs.mopidyPackages.python.sitePackages}" ]; - buildInputs = [ pkgs.makeWrapper ]; - postBuild = '' - makeWrapper ${pkgs.mopidy}/bin/mopidy $out/bin/mopidy \ - --prefix PYTHONPATH : $out/${pkgs.mopidyPackages.python.sitePackages} - ''; - }; + flake-utils.lib.eachDefaultSystem (system: + let + pkgs = import nixpkgs { + system = system; + config = { allowUnfree = true; }; + }; + pkgs-bitwig = import nixpkgs-bitwig { + system = system; + config = { allowUnfree = true; }; + }; + in { + packages.mopidyWithExtensions = pkgs.buildEnv { + name = "mopidy-with-extensions-${pkgs.mopidy.version}"; + paths = pkgs.lib.closePropagation + (with pkgs; [ mopidy-iris mopidy-local mopidy-mpd ]); + pathsToLink = [ "/${pkgs.mopidyPackages.python.sitePackages}" ]; + buildInputs = [ pkgs.makeWrapper ]; + postBuild = '' + makeWrapper ${pkgs.mopidy}/bin/mopidy $out/bin/mopidy \ + --prefix PYTHONPATH : $out/${pkgs.mopidyPackages.python.sitePackages} + ''; + }; - packages.conda-custom = pkgs.conda.override { - extraPkgs = with pkgs; [ glib which ]; - }; + packages.conda-custom = + pkgs.conda.override { extraPkgs = with pkgs; [ glib which ]; }; - packages.bitwig-studio3 = pkgs-bitwig.callPackage ./nix/bitwig-studio3.nix { + packages.bitwig-studio3 = + pkgs-bitwig.callPackage ./nix/bitwig-studio3.nix { bitwig-studio1 = pkgs-bitwig.callPackage ./nix/bitwig-studio1.nix { zenity = pkgs-bitwig.gnome3.zenity; libxkbcommon = pkgs-bitwig.libxkbcommon_7; }; }; - devShells = { - empty = import ./dev-shells/empty.nix { pkgs = pkgs; }; - empty-multi = import ./dev-shells/empty-multi.nix { pkgs = pkgs; }; - empty-multi-static = import ./dev-shells/empty-multi.nix { pkgs = pkgs.pkgsStatic; }; - empty-clang = import ./dev-shells/empty-clang.nix { pkgs = pkgs; }; - empty-clang-multi = import ./dev-shells/empty-clang-multi.nix { pkgs = pkgs; }; + devShells = { + empty = import ./dev-shells/empty.nix { pkgs = pkgs; }; + empty-multi = import ./dev-shells/empty-multi.nix { pkgs = pkgs; }; + empty-multi-static = + import ./dev-shells/empty-multi.nix { pkgs = pkgs.pkgsStatic; }; + empty-clang = import ./dev-shells/empty-clang.nix { pkgs = pkgs; }; + empty-clang-multi = + import ./dev-shells/empty-clang-multi.nix { pkgs = pkgs; }; - basic-cmake = import ./dev-shells/basic-cmake.nix { pkgs = pkgs; }; - basic-rust = import ./dev-shells/basic-rust.nix { pkgs = pkgs; }; + basic-cmake = import ./dev-shells/basic-cmake.nix { pkgs = pkgs; }; + basic-rust = import ./dev-shells/basic-rust.nix { pkgs = pkgs; }; - aby = import ./dev-shells/aby.nix { pkgs = pkgs; }; - spfe = import ./dev-shells/spfe.nix { pkgs = pkgs; }; - zig-bootstrap = import ./dev-shells/zig-bootstrap.nix { pkgs = pkgs; }; - zig = import ./dev-shells/zig.nix { pkgs = pkgs; }; - }; - }) // { - - nixosConfigurations = { - dustbowl = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - modules = [ - (import ./nixos/dustbowl.nix { - nixpkgs = nixpkgs; - }) - ]; + aby = import ./dev-shells/aby.nix { pkgs = pkgs; }; + spfe = import ./dev-shells/spfe.nix { pkgs = pkgs; }; + zig-bootstrap = + import ./dev-shells/zig-bootstrap.nix { pkgs = pkgs; }; + zig = import ./dev-shells/zig.nix { pkgs = pkgs; }; }; + }) // { + + nixosConfigurations = { + dustbowl = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + modules = [ (import ./nixos/dustbowl.nix { nixpkgs = nixpkgs; }) ]; + }; + }; + + legacyPackages = nixpkgs.legacyPackages; + }; - - legacyPackages = nixpkgs.legacyPackages; - - }; }