Unverified Commit e3f10196 authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

Merge pull request #320123 from psanford/rivercarro-upgrade-0.4.0 

rivercarro: 0.3.0 -> 0.4.0
parents 2c3e5a63 8d704b09

pkgs/applications/misc/rivercarro/default.nix

+10 −5
Original line number Diff line number Diff line 
{ lib

, stdenv

, callPackage

, fetchFromSourcehut

, pkg-config

, river

, wayland

, wayland-protocols

, zig_0_11

, zig_0_12

}:



stdenv.mkDerivation (finalAttrs: {

  pname = "rivercarro";

  version = "0.3.0";

  version = "0.4.0";



  src = fetchFromSourcehut {

    owner = "~novakane";

    repo = "rivercarro";

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

    fetchSubmodules = true;

    hash = "sha256-lucwn9MmyVd4pynuG/ZAXnZ384wdS0gi7JN44vNQA1I=";

    hash = "sha256-nDKPv/roweW7ynEROsipUJPvs6VMmz3E4JzEFRBzE6s=";

  };



  nativeBuildInputs = [
@@ -25,9 +26,13 @@ stdenv.mkDerivation (finalAttrs: { 
    river

    wayland

    wayland-protocols

    zig_0_11.hook

    zig_0_12.hook

  ];



  postPatch = ''

    ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p

  '';



  meta = with lib; {

    homepage = "https://git.sr.ht/~novakane/rivercarro";

    description = "Layout generator for river Wayland compositor, fork of rivertile";
@@ -44,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { 
    changelog = "https://git.sr.ht/~novakane/rivercarro/refs/v${finalAttrs.version}";

    license = licenses.gpl3Plus;

    maintainers = with maintainers; [ kraem ];

    inherit (zig_0_11.meta) platforms;

    inherit (zig_0_12.meta) platforms;

    mainProgram = "rivercarro";

  };

})

pkgs/applications/misc/rivercarro/deps.nix

0 → 100644
+13 −0
Original line number Diff line number Diff line 
# generated by zon2nix (https://github.com/nix-community/zon2nix)



{ linkFarm, fetchzip }:



linkFarm "zig-packages" [

  {

    name = "1220b0f8f822c1625af7aae4cb3ab2c4ec1a4c0e99ef32867b2a8d88bb070b3e7f6d";

    path = fetchzip {

      url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.1.0.tar.gz";

      hash = "sha256-VLEx8nRgmJZWgLNBRqrR7bZEkW0m5HTRv984HKwoIfA=";

    };

  }

]