Unverified Commit 530dd26f authored by Mihai Fufezan's avatar Mihai Fufezan
Browse files

hyprwm: update packages 

hyprland-protocols: unstable-2023-01-13 -> 0.2
hyprland: 0.24.0 -> 0.25.0
hyprpaper: unstable-2023-04-05 -> 0.1.0
hyprpicker: unstable-2023-03-31 -> 0.1.0
xdg-desktop-portal-hyprland: unstable-2023-04-06 -> 0.3.1
parent f4886293

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

+6 −6
Original line number Diff line number Diff line
@@ -4,15 +4,15 @@ 
, meson

, ninja

}:

stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "hyprland-protocols";

  version = "unstable-2023-01-13";

  version = "0.2";



  src = fetchFromGitHub {

    owner = "hyprwm";

    repo = pname;

    rev = "eb7dcc0132ad25addc3e8d434c4bfae6bd3a8c90";

    hash = "sha256-gkLgUg9/fP04bKCJMj/rN0r6PV/cbLShDvKQyFvVap0=";

    repo = finalAttrs.pname;

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

    hash = "sha256-QPzwwlGKX95tl6ZEshboZbEwwAXww6lNLdVYd6T9Mrc=";

  };



  nativeBuildInputs = [
@@ -27,4 +27,4 @@ stdenv.mkDerivation rec { 
    maintainers = with lib.maintainers; [ fufexan ];

    platforms = lib.platforms.linux;

  };

}
 
})

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

+9 −9
Original line number Diff line number Diff line
@@ -36,27 +36,27 @@ let 
  '';

in

assert assertXWayland;

stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

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

  version = "0.24.0";

  version = "0.25.0";



  src = fetchFromGitHub {

    owner = "hyprwm";

    repo = "hyprland";

    rev = "v${version}";

    hash = "sha256-zbtxX0NezuNg46PAKscmDfFfNID4rAq2qGNf1BE3Cqc=";

    repo = finalAttrs.pname;

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

    hash = "sha256-Npf48UUfywneFYGEc7NQ59xudwvw7EJjwweT4tHguIY=";

  };



  patches = [

    # make meson use the provided dependencies instead of the git submodules

    "${src}/nix/meson-build.patch"

    "${finalAttrs.src}/nix/meson-build.patch"

  ];



  postPatch = ''

    # Fix hardcoded paths to /usr installation

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

    substituteInPlace meson.build \

      --replace "@GIT_COMMIT_HASH@" '${version}' \

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

      --replace "@GIT_DIRTY@" ""

  '';
@@ -71,6 +71,7 @@ stdenv.mkDerivation rec { 
  outputs = [

    "out"

    "man"

    "dev"

  ];



  buildInputs =
@@ -103,7 +104,6 @@ stdenv.mkDerivation rec { 
    (lib.optional withSystemd "-Dsystemd=enabled")

  ];





  passthru.providedSessions = [ "hyprland" ];



  meta = with lib; {
@@ -114,4 +114,4 @@ stdenv.mkDerivation rec { 
    mainProgram = "Hyprland";

    platforms = wlroots.meta.platforms;

  };

}
 
})

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

+2 −2
Original line number Diff line number Diff line
@@ -49,8 +49,8 @@ assert (lib.assertMsg (hidpiXWayland -> enableXWayland) '' 
      domain = "gitlab.freedesktop.org";

      owner = "wlroots";

      repo = "wlroots";

      rev = "7abda952d0000b72d240fe1d41457b9288f0b6e5";

      hash = "sha256-LmI/4Yp/pOOoI4RxLRx9I90NBsiqdRLVOfbATKlgpkg=";

      rev = "6830bfc17fd94709e2cdd4da0af989f102a26e59";

      hash = "sha256-GGEjkQO9m7YLYIXIXM76HWdhjg4Ye+oafOtyaFAYKI4=";

    };



    pname =

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

+4 −4
Original line number Diff line number Diff line
@@ -13,13 +13,13 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "hyprpaper";

  version = "unstable-2023-04-05";

  version = "0.1.0";



  src = fetchFromGitHub {

    owner = "hyprwm";

    repo = "hyprpaper";

    rev = "9182de9ffc8c76fbf24d16dec0ea7a9430597a06";

    hash = "sha256-LqvhYx1Gu+rlkF4pA1NYZzwRQwz3FeWBqXqmQq86m8o=";

    repo = finalAttrs.pname;

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

    hash = "sha256-/Kz4Qy+jx1+bfSq6e2W3MbyODkhs6GqKiiybNtqzvbc=";

  };



  nativeBuildInputs = [

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

+5 −5
Original line number Diff line number Diff line
@@ -21,14 +21,14 @@ 
, libXdmcp

, debug ? false

}:

stdenv.mkDerivation {

stdenv.mkDerivation (finalAttrs: {

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

  version = "unstable-2023-03-31";

  version = "0.1.0";



  src = fetchFromGitHub {

    owner = "hyprwm";

    repo = "hyprpicker";

    rev = "cc6b3234b2966acd61c8a2e5caae947774666601";

    repo = finalAttrs.pname;

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

    hash = "sha256-8Tc8am5+iQvzRdnTYIpD3Ewge6TIctrm8tr0H+RvcsE=";

  };
@@ -92,4 +92,4 @@ stdenv.mkDerivation { 
    maintainers = with maintainers; [ fufexan ];

    platforms = wayland.meta.platforms;

  };

}
 
})