From 1a5bb68696c2bfb3a2661d9f2096030b0da0bccc Mon Sep 17 00:00:00 2001 From: obadz <obadz-git@obadz.com> Date: Mon, 5 Sep 2016 16:17:30 +0100 Subject: [PATCH] gtk-sharp-*: remove references to gnomepanel gnomepanel was part of Gnome 2 and is currently broken. There seemed to be no runtime dependency to gnomepanel and building also seems to work fine without it. --- pkgs/development/libraries/gtk-sharp/2.0.nix | 2 -- pkgs/development/libraries/gtk-sharp/3.0.nix | 2 -- pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/gtk-sharp/2.0.nix b/pkgs/development/libraries/gtk-sharp/2.0.nix index 20c79d7202eb..a8667770271e 100644 --- a/pkgs/development/libraries/gtk-sharp/2.0.nix +++ b/pkgs/development/libraries/gtk-sharp/2.0.nix @@ -10,7 +10,6 @@ , libgnomeui ? null , libgnomeprint ? null , libgnomeprintui ? null -, gnomepanel ? null , libxml2 , monoDLLFixer }: @@ -36,7 +35,6 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig mono glib pango gtk GConf libglade libgnomecanvas libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2 - gnomepanel ]; dontStrip = true; diff --git a/pkgs/development/libraries/gtk-sharp/3.0.nix b/pkgs/development/libraries/gtk-sharp/3.0.nix index 9fb99c3f27e7..459f37afc7fe 100644 --- a/pkgs/development/libraries/gtk-sharp/3.0.nix +++ b/pkgs/development/libraries/gtk-sharp/3.0.nix @@ -10,7 +10,6 @@ , libgnomeui ? null , libgnomeprint ? null , libgnomeprintui ? null -, gnomepanel ? null , libxml2 , monoDLLFixer }: @@ -35,7 +34,6 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig mono glib pango gtk3 GConf libglade libgnomecanvas libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2 - gnomepanel ]; dontStrip = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6399ef8703b2..c33dc33e6db7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7636,13 +7636,13 @@ in gtk-sharp-2_0 = callPackage ../development/libraries/gtk-sharp/2.0.nix { inherit (gnome) libglade libgtkhtml gtkhtml libgnomecanvas libgnomeui libgnomeprint - libgnomeprintui GConf gnomepanel; + libgnomeprintui GConf; }; gtk-sharp-3_0 = callPackage ../development/libraries/gtk-sharp/3.0.nix { inherit (gnome) libglade libgtkhtml gtkhtml libgnomecanvas libgnomeui libgnomeprint - libgnomeprintui GConf gnomepanel; + libgnomeprintui GConf; }; gtk-sharp = self.gtk-sharp-2_0;