flake: update & cleanup

Alexays · Dec 1, 2023 · eef229e · eef229e
1 parent 1572bc8
commit eef229e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 129 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -3,15 +3,13 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    devshell.url = "github:numtide/devshell";
-    flake-utils.url = "github:numtide/flake-utils";
     flake-compat = {
       url = "github:edolstra/flake-compat";
       flake = false;
     };
   };
 
-  outputs = { self, flake-utils, devshell, nixpkgs, flake-compat }:
+  outputs = { self, nixpkgs, ... }:
     let
       inherit (nixpkgs) lib;
       genSystems = lib.genAttrs [
@@ -43,48 +41,25 @@
             default = self.packages.${system}.waybar;
           });
     } //
-    flake-utils.lib.eachDefaultSystem (system: {
-      devShell =
+    genSystems (system: {
+      devShells.default =
         let pkgs = import nixpkgs {
           inherit system;
-
-          overlays = [ devshell.overlays.default ];
         };
         in
-        pkgs.devshell.mkShell {
-          imports = [ "${pkgs.devshell.extraModulesDir}/language/c.nix" ];
+        pkgs.mkShell {
+          name = "waybar-shell";
+
+          # most of these aren't actually used in the waybar derivation, this is just in case
+          # they will ever start being used
+          inherit (pkgs.waybar) buildInputs depsBuildBuild depsBuildBuildPropagated depsBuildTarget
+            depsBuildTargetPropagated depsHostHost depsHostHostPropagated depsTargetTarget
+            depsTargetTargetPropagated propagatedBuildInputs propagatedNativeBuildInputs strictDeps;
 
-          devshell.packages = with pkgs; [
+          nativeBuildInputs = pkgs.waybar.nativeBuildInputs ++ (with pkgs; [
             clang-tools
             gdb
-            # from nativeBuildInputs
-            gnumake
-            meson
-            ninja
-            pkg-config
-            scdoc
-          ] ++ (map lib.getDev [
-            # from buildInputs
-            wayland wlroots gtkmm3 libsigcxx jsoncpp spdlog gtk-layer-shell howard-hinnant-date libxkbcommon
-            # optional dependencies
-            gobject-introspection glib playerctl python3.pkgs.pygobject3
-            libevdev libinput libjack2 libmpdclient playerctl libnl
-            libpulseaudio sndio sway libdbusmenu-gtk3 udev upower wireplumber
-
-            # from propagated build inputs?
-            at-spi2-atk atkmm cairo cairomm catch2 fmt_8 fontconfig
-            gdk-pixbuf glibmm gtk3 harfbuzz pango pangomm wayland-protocols
           ]);
-
-          env = with pkgs; [
-            { name = "CPLUS_INCLUDE_PATH"; prefix = "$DEVSHELL_DIR/include"; }
-            { name = "PKG_CONFIG_PATH"; prefix = "$DEVSHELL_DIR/lib/pkgconfig"; }
-            { name = "PKG_CONFIG_PATH"; prefix = "$DEVSHELL_DIR/share/pkgconfig"; }
-            { name = "PATH"; prefix = "${wayland.bin}/bin"; }
-            { name = "LIBRARY_PATH"; prefix = "${lib.getLib sndio}/lib"; }
-            { name = "LIBRARY_PATH"; prefix = "${lib.getLib zlib}/lib"; }
-            { name = "LIBRARY_PATH"; prefix = "${lib.getLib howard-hinnant-date}/lib"; }
-          ];
         };
     });
 }