Merge pull request #297939 from FedericoSchonborn/budgie-updates (427650b9) · Commits · nix / nixpkgs

pkgs/desktops/budgie/budgie-backgrounds/default.nix

+7 −7

Original line number	Diff line number	Diff line
		@@ -7,14 +7,14 @@
		, ninja
		}:

		stdenv.mkDerivation rec {
		stdenv.mkDerivation (finalAttrs: {
		pname = "budgie-backgrounds";
		version = "3.0";

		src = fetchFromGitHub {
		owner = "BuddiesOfBudgie";
		repo = "budgie-backgrounds";
		rev = "v${version}";
		rev = "v${finalAttrs.version}";
		hash = "sha256-2E6+WDLIAwqiiPMJw+tLDCT3CnpboH4X0cB87zw/hBQ=";
		};

		@@ -25,11 +25,11 @@ stdenv.mkDerivation rec {
		ninja
		];

		meta = with lib; {
		meta = {
		description = "The default background set for the Budgie Desktop";
		homepage = "https://github.com/BuddiesOfBudgie/budgie-backgrounds";
		platforms = platforms.linux;
		maintainers = teams.budgie.members;
		license = licenses.cc0;
		platforms = lib.platforms.linux;
		maintainers = lib.teams.budgie.members;
		license = lib.licenses.cc0;
		};
		}
		})

+8 −8

Original line number	Diff line number	Diff line
		@@ -56,14 +56,14 @@
		, enableSshSocket ? false
		}:

		stdenv.mkDerivation rec {
		stdenv.mkDerivation (finalAttrs: {
		pname = "budgie-control-center";
		version = "1.4.0";

		src = fetchFromGitHub {
		owner = "BuddiesOfBudgie";
		repo = pname;
		rev = "v${version}";
		repo = "budgie-control-center";
		rev = "v${finalAttrs.version}";
		fetchSubmodules = true;
		sha256 = "sha256-W5PF7BPdQdg/7xJ4J+fEnuDdpoG/lyhX56RDnX2DXoY=";
		};
		@@ -167,12 +167,12 @@ stdenv.mkDerivation rec {

		separateDebugInfo = true;

		meta = with lib; {
		meta = {
		description = "A fork of GNOME Control Center for the Budgie 10 Series";
		homepage = "https://github.com/BuddiesOfBudgie/budgie-control-center";
		mainProgram = "budgie-control-center";
		platforms = platforms.linux;
		maintainers = teams.budgie.members;
		license = licenses.gpl2Plus;
		platforms = lib.platforms.linux;
		maintainers = lib.teams.budgie.members;
		license = lib.licenses.gpl2Plus;
		};
		}
		})

+8 −5

Original line number	Diff line number	Diff line
		@@ -72,13 +72,14 @@ stdenv.mkDerivation (finalAttrs: {
		gnome.mutter
		gnome.zenity
		graphene
		gst_all_1.gstreamer
		gst_all_1.gst-plugins-base
		gtk3
		ibus
		libcanberra-gtk3
		libgee
		libGL
		libnotify
		libpeas
		libpulseaudio
		libuuid
		libwnck
		@@ -88,10 +89,12 @@ stdenv.mkDerivation (finalAttrs: {
		sassc
		upower
		xfce.libxfce4windowing
		] ++ (with gst_all_1; [
		gstreamer
		gst-plugins-base
		]);
		];

		propagatedBuildInputs = [
		# budgie-1.0.pc, budgie-raven-plugin-1.0.pc
		libpeas
		];

		passthru.providedSessions = [
		"budgie-desktop"

+8 −8

Original line number	Diff line number	Diff line
		@@ -17,14 +17,14 @@
		, xorg
		}:

		stdenv.mkDerivation rec {
		stdenv.mkDerivation (finalAttrs: {
		pname = "budgie-screensaver";
		version = "5.1.0";

		src = fetchFromGitHub {
		owner = "BuddiesOfBudgie";
		repo = pname;
		rev = "v${version}";
		repo = "budgie-screensaver";
		rev = "v${finalAttrs.version}";
		sha256 = "sha256-N8x9hdbaMDisTbQPJedNO4UMLnCn+Q2hhm4udJZgQlc=";
		};

		@@ -50,12 +50,12 @@ stdenv.mkDerivation rec {

		env.NIX_CFLAGS_COMPILE = "-D_POSIX_C_SOURCE";

		meta = with lib; {
		meta = {
		description = "A fork of old GNOME Screensaver for purposes of providing an authentication prompt on wake";
		homepage = "https://github.com/BuddiesOfBudgie/budgie-screensaver";
		mainProgram = "budgie-screensaver";
		platforms = platforms.linux;
		maintainers = teams.budgie.members;
		license = licenses.gpl2Only;
		platforms = lib.platforms.linux;
		maintainers = lib.teams.budgie.members;
		license = lib.licenses.gpl2Only;
		};
		}
		})

+4 −2

Original line number	Diff line number	Diff line
		{ lib, pkgs }:
		{ lib, newScope }:

		lib.makeScope pkgs.newScope (self: with self; {
		lib.makeScope newScope (self: let
		inherit (self) callPackage;
		in {
		budgie-backgrounds = callPackage ./budgie-backgrounds { };
		budgie-control-center = callPackage ./budgie-control-center { };
		budgie-desktop = callPackage ./budgie-desktop { };