diff --git a/flake.lock b/flake.lock index 7a93a53f..b0f9c75d 100644 --- a/flake.lock +++ b/flake.lock @@ -167,11 +167,11 @@ }, "nixpkgs-next-unpatched": { "locked": { - "lastModified": 1715580068, - "narHash": "sha256-EuE4shavKc+ZX3eKbeVFLvajC72taSCh5kPc+91K9/k=", + "lastModified": 1715601680, + "narHash": "sha256-Gmz6U8NMZVVnP6AGX4sMl4X6RcQBASPl/2Gj9R5k1Pk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6a217e9b1d39415076c7a6cfc44be5e935e7a839", + "rev": "eda36d7cf3391ad06097009b08822fb74acd5e00", "type": "github" }, "original": { @@ -199,11 +199,11 @@ }, "nixpkgs-unpatched": { "locked": { - "lastModified": 1715585398, - "narHash": "sha256-gkjMf9c+ggjxQ9hYDlVlLbz5IQ1WPtoyCl4EIImHJps=", + "lastModified": 1715616096, + "narHash": "sha256-rxh2XECb5hRzgNR4Xqj3aAjg6821LmNTVRfF6sUW6fI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6bc8c8a7ac13182ee24a5e2caab7ad739f1c55c5", + "rev": "0a949cf2618e8eab83aa008f1f8e03db137ed36c", "type": "github" }, "original": { @@ -223,11 +223,11 @@ ] }, "locked": { - "lastModified": 1715584565, - "narHash": "sha256-lg2mUWqSG5puwVBMGWo1fUhLuLxnsZoxItJqi68caiA=", + "lastModified": 1715609745, + "narHash": "sha256-z2lQ7G1AxljvYeqrHWjc1ctOI4QZP06vPtvLYJWfZSc=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "5f7272dff81558143f93e2cb32189a52ef965892", + "rev": "ed18785b8816fa878bdd9df7f2e8722695401ef8", "type": "github" }, "original": { diff --git a/nixpatches/list.nix b/nixpatches/list.nix index de8b553f..fb5ccc19 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -33,9 +33,9 @@ in [ # and can be found with `nix-repl > :lf . > lastModifiedDate` (fetchpatch' { - title = "nixos/zsh: fix `lib.lib.mkAfter` typo"; - saneCommit = "e4fdd34dd9cf4797216f3ed37c416dcb147dd7a7"; - hash = "sha256-VG1wn8Z1K28bZfrcg4qFmecRMJq/T0XkgACt73GioZs="; + title = "hyprland: fix cross compilation"; + prUrl = "https://github.com/NixOS/nixpkgs/pull/311408"; + hash = "sha256-OU5XT/BEmZu1TPXSLKfEgdkoGXRETvJ9dePCeHrFl6o="; }) (fetchpatch' { diff --git a/overlays/cross.nix b/overlays/cross.nix index 7d1235e0..6cc8d836 100644 --- a/overlays/cross.nix +++ b/overlays/cross.nix @@ -997,6 +997,7 @@ in with final; { # ''; # }); + # hyprland = mvToNativeInputs [ hwdata ] prev.hyprland; # hyprland = prev.hyprland.overrideAttrs (_: { # depsBuildBuild = [ pkg-config ]; # });