Unverified Commit 26dc8777 authored by Bobby Rong's avatar Bobby Rong Committed by GitHub
Browse files

Merge pull request #269553 from FedericoSchonborn/budgie.magpie-no-shared-components 

budgie.magpie: Don't install shared components
parents 8a96f54d bf68ef90

pkgs/desktops/budgie/budgie-control-center/default.nix

+2 −3
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ 
, libwacom

, libxml2

, libxslt

, magpie

, meson

, modemmanager

, networkmanager
@@ -109,6 +108,7 @@ stdenv.mkDerivation rec { 
    gnome.gnome-remote-desktop

    gnome.gnome-settings-daemon

    gnome.gnome-user-share

    gnome.mutter

    gsettings-desktop-schemas

    gsound

    gtk3
@@ -126,7 +126,6 @@ stdenv.mkDerivation rec { 
    libsecret

    libwacom

    libxml2

    magpie

    modemmanager

    networkmanager

    polkit
@@ -159,7 +158,7 @@ stdenv.mkDerivation rec { 
      --prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share"

      --prefix XDG_DATA_DIRS : "${librsvg}/share"

      # WM keyboard shortcuts

      --prefix XDG_DATA_DIRS : "${magpie}/share"

      --prefix XDG_DATA_DIRS : "${gnome.mutter}/share"

    )

  '';

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

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ stdenv.mkDerivation (finalAttrs: { 
    gnome-menus

    gnome.gnome-bluetooth_1_0

    gnome.gnome-settings-daemon

    gnome.mutter

    gnome.zenity

    graphene

    gtk3

pkgs/desktops/budgie/budgie-gsettings-overrides/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
, budgie-desktop-view

, glib

, gsettings-desktop-schemas

, magpie

, gnome

, mate

, nixos-artwork

, nixos-background-light ? nixos-artwork.wallpapers.nineish
@@ -63,7 +63,7 @@ let 
      budgie-desktop

      budgie-desktop-view

      gsettings-desktop-schemas

      magpie

      gnome.mutter

  ] ++ extraGSettingsOverridePackages;



in

pkgs/desktops/budgie/magpie/default.nix

+0 −1
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ stdenv.mkDerivation (finalAttrs: { 
    "-Degl_device=true"

    "-Dprofiler=true"

    "-Ddocs=true"

    "-Dwith_shared_components=true"

  ];



  propagatedBuildInputs = [