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

Merge pull request #247160 from wineee/wayfire-rec

parents a22f9d2a 2b8a2792

pkgs/applications/window-managers/wayfire/default.nix

+10 −10
Original line number Diff line number Diff line
@@ -21,16 +21,16 @@ 
, xorg

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "wayfire";

  version = "0.7.5";



  src = fetchFromGitHub {

    owner = "WayfireWM";

    repo = pname;

    rev = "v${version}";

    repo = "wayfire";

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

    fetchSubmodules = true;

    sha256 = "sha256-Z+rR9pY244I3i/++XZ4ROIkq3vtzMgcxxHvJNxFD9is=";

    hash = "sha256-Z+rR9pY244I3i/++XZ4ROIkq3vtzMgcxxHvJNxFD9is=";

  };



  nativeBuildInputs = [
@@ -40,7 +40,6 @@ stdenv.mkDerivation rec { 
    wayland-scanner

  ];





  buildInputs = [

    wf-config

    libdrm
@@ -78,11 +77,12 @@ stdenv.mkDerivation rec { 


  passthru.providedSessions = [ "wayfire" ];



  meta = with lib; {

  meta = {

    homepage = "https://wayfire.org/";

    description = "3D Wayland compositor";

    license = licenses.mit;

    maintainers = with maintainers; [ qyliss wucke13 rewine ];

    platforms = platforms.unix;

    license = lib.licenses.mit;

    maintainers = with lib.maintainers; [ qyliss wucke13 rewine ];

    platforms = lib.platforms.unix;

    mainProgram = "wayfire";

  };

}
 
})

pkgs/applications/window-managers/wayfire/wcm.nix

+10 −9
Original line number Diff line number Diff line
@@ -16,16 +16,16 @@ 
, libxml2

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "wcm";

  version = "0.7.5";



  src = fetchFromGitHub {

    owner = "WayfireWM";

    repo = pname;

    rev = "v${version}";

    repo = "wcm";

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

    fetchSubmodules = true;

    sha256 = "sha256-LJR9JGl49o4O6LARofz3jOeAqseGcmzVhMnhk/aobUU=";

    hash = "sha256-LJR9JGl49o4O6LARofz3jOeAqseGcmzVhMnhk/aobUU=";

  };



  nativeBuildInputs = [
@@ -51,11 +51,12 @@ stdenv.mkDerivation rec { 
    "-Denable_wdisplays=false"

  ];



  meta = with lib; {

  meta = {

    homepage = "https://github.com/WayfireWM/wcm";

    description = "Wayfire Config Manager";

    license = licenses.mit;

    maintainers = with maintainers; [ qyliss wucke13 rewine ];

    platforms = platforms.unix;

    license = lib.licenses.mit;

    maintainers = with lib.maintainers; [ qyliss wucke13 rewine ];

    platforms = lib.platforms.unix;

    mainProgram = "wcm";

  };

}
 
})

pkgs/applications/window-managers/wayfire/wf-config.nix

+9 −9
Original line number Diff line number Diff line
@@ -11,15 +11,15 @@ 
, libxml2

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "wf-config";

  version = "0.7.1";



  src = fetchFromGitHub {

    owner = "WayfireWM";

    repo = pname;

    rev = "v${version}";

    sha256 = "sha256-ADUBvDJcPYEB9ZvaFIgTfemo1WYwiWgCWX/z2yrEPtA=";

    repo = "wf-config";

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

    hash = "sha256-ADUBvDJcPYEB9ZvaFIgTfemo1WYwiWgCWX/z2yrEPtA=";

  };



  nativeBuildInputs = [
@@ -50,11 +50,11 @@ stdenv.mkDerivation rec { 


  doCheck = true;



  meta = with lib; {

  meta = {

    homepage = "https://github.com/WayfireWM/wf-config";

    description = "Library for managing configuration files, written for Wayfire";

    license = licenses.mit;

    maintainers = with maintainers; [ qyliss wucke13 rewine ];

    platforms = platforms.unix;

    license = lib.licenses.mit;

    maintainers = with lib.maintainers; [ qyliss wucke13 rewine ];

    platforms = lib.platforms.unix;

  };

}
 
})

pkgs/applications/window-managers/wayfire/wf-shell.nix

+9 −9
Original line number Diff line number Diff line
@@ -13,16 +13,16 @@ 
, pulseaudio

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "wf-shell";

  version = "0.7.0";



  src = fetchFromGitHub {

    owner = "WayfireWM";

    repo = pname;

    rev = "v${version}";

    repo = "wf-shell";

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

    fetchSubmodules = true;

    sha256 = "sha256-iQUBuNjbZuf51A69RC6NsMHFZCFRv+d9XZ0HtP6OpOA=";

    hash = "sha256-iQUBuNjbZuf51A69RC6NsMHFZCFRv+d9XZ0HtP6OpOA=";

  };



  nativeBuildInputs = [
@@ -43,11 +43,11 @@ stdenv.mkDerivation rec { 


  mesonFlags = [ "--sysconfdir /etc" ];



  meta = with lib; {

  meta = {

    homepage = "https://github.com/WayfireWM/wf-shell";

    description = "GTK3-based panel for Wayfire";

    license = licenses.mit;

    maintainers = with maintainers; [ qyliss wucke13 rewine ];

    platforms = platforms.unix;

    license = lib.licenses.mit;

    maintainers = with lib.maintainers; [ qyliss wucke13 rewine ];

    platforms = lib.platforms.unix;

  };

}
 
})