Unverified Commit 33d97fee authored by Artturi's avatar Artturi Committed by GitHub
Browse files

Merge pull request #261451 from fufexan/hyprland

parents 955525b5 3be139fc

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

+11 −5
Original line number Diff line number Diff line
@@ -40,13 +40,13 @@ assert lib.assertMsg (!nvidiaPatches) "The option `nvidiaPatches` has been renam 
assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been removed. Please refer https://wiki.hyprland.org/Configuring/XWayland";

stdenv.mkDerivation (finalAttrs: {

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

  version = "0.30.0";

  version = "0.31.0";



  src = fetchFromGitHub {

    owner = "hyprwm";

    repo = finalAttrs.pname;

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

    hash = "sha256-a0nqm82brOC0QroGOXxcIKxOMAfl9I6pfFOYjCeRzO0=";

    hash = "sha256-8n67P8wvtFgjOufTj4y1sRpBcbMrlhSlH7d8dOhUKns=";

  };



  patches = [
@@ -57,9 +57,15 @@ stdenv.mkDerivation (finalAttrs: { 
  postPatch = ''

    # Fix hardcoded paths to /usr installation

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

    substituteInPlace meson.build \

      --replace "@GIT_COMMIT_HASH@" '${finalAttrs.src.rev}' \

      --replace "@GIT_DIRTY@" ""



    # Generate version.h

    cp src/version.h.in src/version.h

    substituteInPlace src/version.h \

      --replace "@HASH@" '${finalAttrs.src.rev}' \

      --replace "@BRANCH@" "" \

      --replace "@MESSAGE@" "" \

      --replace "@TAG@" "" \

      --replace "@DIRTY@" ""

  '';



  nativeBuildInputs = [

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

+2 −2
Original line number Diff line number Diff line
@@ -42,8 +42,8 @@ wlroots.overrideAttrs 
      domain = "gitlab.freedesktop.org";

      owner = "wlroots";

      repo = "wlroots";

      rev = "98a745d926d8048bc30aef11b421df207a01c279";

      hash = "sha256-LEIUGXvKR5DYFQUTavC3yifcObvG4XZUUHfxXmu8nEM=";

      rev = "3406c1b17a4a7e6d4e2a7d9c1176affa72bce1bc";

      hash = "sha256-ecDhdYLXWHsxMv+EWG36mCNDvzRbu9qfjH7dLxL7aGM=";

    };



    pname =

pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix

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

stdenv.mkDerivation (self: {

  pname = "xdg-desktop-portal-hyprland";

  version = "1.1.0";

  version = "1.2.3";



  src = fetchFromGitHub {

    owner = "hyprwm";

    repo = "xdg-desktop-portal-hyprland";

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

    hash = "sha256-K1cqx+NP4lxPwRVPLEeSUfagaMI3m5hdYvQe7sZr7BU=";

    hash = "sha256-y8q4XUwx+gVK7i2eLjfR32lVo7TYvEslyzrmzYEaPZU=";

  };



  nativeBuildInputs = [