fix: nixpkgs

sioodmy · May 9, 2024 · a33ee63 · a33ee63
1 parent 205e526
commit a33ee63
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 29 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -91,7 +91,7 @@
     });
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/58a1abdbae3217ca6b702f03d3b35125d88a2994";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     nixpkgs-small.url = "github:NixOS/nixpkgs/nixos-unstable-small"; # moves faster, has less packages
     nixos-hardware.url = "github:nixos/nixos-hardware";
     impermanence.url = "github:nix-community/impermanence";

diff --git a/home/rice/dunst.nix b/home/rice/dunst.nix
@@ -7,14 +7,14 @@
 in {
   services.dunst = {
     enable = true;
-    package = pkgs.dunst.overrideAttrs (_: {
-      src = pkgs.fetchFromGitHub {
-        owner = "sioodmy";
-        repo = "dunst";
-        rev = "6477864bd870dc74f9cf76bb539ef89051554525";
-        sha256 = "FCoGrYipNOZRvee6Ks5PQB5y2IvN+ptCAfNuLXcD8Sc=";
-      };
-    });
+    # package = pkgs.dunst.overrideAttrs (_: {
+    #   src = pkgs.fetchFromGitHub {
+    #     owner = "sioodmy";
+    #     repo = "dunst";
+    #     rev = "6477864bd870dc74f9cf76bb539ef89051554525";
+    #     sha256 = "FCoGrYipNOZRvee6Ks5PQB5y2IvN+ptCAfNuLXcD8Sc=";
+    #   };
+    # });
     iconTheme = {
       package = pkgs.catppuccin-papirus-folders;
       name = "Papirus";

diff --git a/system/core/nix.nix b/system/core/nix.nix
@@ -39,6 +39,14 @@
       ];
 
       overlays = [
+        (self: super: {
+          # temporary fix until upstream applies the fix we have used
+          # which is just to add wrapGAppsNoGuiHook to the nativeBuildInputs
+          # See: <https://github.com/NixOS/nixpkgs/pull/309315>
+          networkd-dispatcher = super.networkd-dispatcher.overrideAttrs (oldAttrs: {
+            nativeBuildInputs = (oldAttrs.nativeBuildInputs or []) ++ [pkgs.wrapGAppsNoGuiHook];
+          });
+        })
         # workaround for: https://github.com/NixOS/nixpkgs/issues/154163
         (_: super: {
           coreutils = super.uutils-coreutils-noprefix;
@@ -64,7 +72,7 @@
       dates = "daily";
       options = "--delete-older-than 3d";
     };
-    # package = pkgs.nixVersions.git;
+    package = pkgs.nixVersions.git;
 
     # Make builds run with low priority so my system stays responsive
     daemonCPUSchedPolicy = "idle";