Unverified Commit ba4cdca4 authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #314522 from NixOS/backport-313498-to-release-24.05 

[Backport release-24.05] hyprland: 0.40.0-unstable-2024-05-12 -> 0.40.0-unstable-2024-05-05, hyprwayland-scanner: 0.3.8 -> 0.3.4
parents 45cef8da a12dac41

pkgs/applications/window-managers/hyprwm/hyprland/default.nix

+4 −7
Original line number Diff line number Diff line
@@ -53,26 +53,23 @@ assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been remov 


stdenv.mkDerivation (finalAttrs: {

  pname = "hyprland" + lib.optionalString debug "-debug";

  version = "0.40.0-unstable-2024-05-12";

  version = "0.40.0-unstable-2024-05-05";



  src = fetchFromGitHub {

    owner = "hyprwm";

    repo = finalAttrs.pname;

    fetchSubmodules = true;

    rev = "2ccd45a84475fab46c6fecd2fe226d3173104743";

    hash = "sha256-nBCQuRl4sS/G/OUS+txeelFShBEgSk2OrN6kBYMHuOg=";

    rev = "f15513309b24790099d42974274eb23f66f7c985";

    hash = "sha256-zKOfgXPTlRqCR+EME4qjN9rgAnC3viI5KWx10dhKszw=";

  };



  postPatch = ''

    # Fix hardcoded paths to /usr installation

    sed -i "s#/usr#$out#" src/render/OpenGL.cpp



    # Remove extra @PREFIX@ to fix pkg-config paths

    sed -i "s#@PREFIX@/##g" hyprland.pc.in

  '';



  # used by version.sh

  DATE = "2024-05-12";

  DATE = "2024-05-05";

  HASH = finalAttrs.src.rev;



  depsBuildBuild = [

pkgs/by-name/hy/hyprwayland-scanner/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -8,13 +8,13 @@ 
}:

stdenv.mkDerivation (finalAttrs: {

  pname = "hyprwayland-scanner";

  version = "0.3.8";

  version = "0.3.4";



  src = fetchFromGitHub {

    owner = "hyprwm";

    repo = "hyprwayland-scanner";

    rev = "v${finalAttrs.version}";

    hash = "sha256-/DwglRvj4XF4ECdNtrCIbthleszAZBwOiXG5A6r0K/c=";

    hash = "sha256-D0pg+ZRwrt4lavZ97Ca8clsgbPA3duLj8iEM7riaIFY=";

  };



  nativeBuildInputs = [