diff options
| author | piegames <git@piegames.de> | 2022-01-16 00:43:13 +0100 |
|---|---|---|
| committer | piegames <git@piegames.de> | 2022-01-29 18:09:14 +0100 |
| commit | 48e2f6885f797d42a8630982713623c10413963e (patch) | |
| tree | fd97db3dc6b5bfdbc3eff4d157660c3703e27509 | |
| parent | dcc2473370e8b4799688118a1b98964955204357 (diff) | |
| download | nixpkgs-48e2f6885f797d42a8630982713623c10413963e.tar nixpkgs-48e2f6885f797d42a8630982713623c10413963e.tar.gz nixpkgs-48e2f6885f797d42a8630982713623c10413963e.tar.bz2 nixpkgs-48e2f6885f797d42a8630982713623c10413963e.tar.lz nixpkgs-48e2f6885f797d42a8630982713623c10413963e.tar.xz nixpkgs-48e2f6885f797d42a8630982713623c10413963e.tar.zst nixpkgs-48e2f6885f797d42a8630982713623c10413963e.zip | |
gtk-sharp*: remove old optional Gnome2 dependencies
They were marked as optional with `dependency ? null`, however they were references unconditionally in the `buildInputs`. I don't know how all of this ever worked, but it's removed anyways now.
| -rw-r--r-- | pkgs/development/libraries/gtk-sharp/2.0.nix | 12 | ||||
| -rw-r--r-- | pkgs/development/libraries/gtk-sharp/3.0.nix | 12 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 12 |
3 files changed, 6 insertions, 30 deletions
diff --git a/pkgs/development/libraries/gtk-sharp/2.0.nix b/pkgs/development/libraries/gtk-sharp/2.0.nix index f35f5e0552c..b083ca02cf2 100644 --- a/pkgs/development/libraries/gtk-sharp/2.0.nix +++ b/pkgs/development/libraries/gtk-sharp/2.0.nix @@ -6,14 +6,6 @@ , glib , pango , gtk2 -, GConf ? null -, libglade ? null -, libgtkhtml ? null -, gtkhtml ? null -, libgnomecanvas ? null -, libgnomeui ? null -, libgnomeprint ? null -, libgnomeprintui ? null , libxml2 , monoDLLFixer , autoconf @@ -54,8 +46,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoconf automake libtool which ]; buildInputs = [ - mono glib pango gtk2 GConf libglade libgnomecanvas - libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2 + mono glib pango gtk2 + libxml2 ]; preConfigure = '' diff --git a/pkgs/development/libraries/gtk-sharp/3.0.nix b/pkgs/development/libraries/gtk-sharp/3.0.nix index 6b996244a9f..8b594a00a7e 100644 --- a/pkgs/development/libraries/gtk-sharp/3.0.nix +++ b/pkgs/development/libraries/gtk-sharp/3.0.nix @@ -6,14 +6,6 @@ , glib , pango , gtk3 -, GConf ? null -, libglade ? null -, libgtkhtml ? null -, gtkhtml ? null -, libgnomecanvas ? null -, libgnomeui ? null -, libgnomeprint ? null -, libgnomeprintui ? null , libxml2 , monoDLLFixer }: @@ -30,8 +22,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - mono glib pango gtk3 GConf libglade libgnomecanvas - libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2 + mono glib pango gtk3 + libxml2 ]; patches = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d846dba3146..3f469c27481 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17057,17 +17057,9 @@ with pkgs; gtk-engine-murrine = callPackage ../development/libraries/gtk-engine-murrine { }; - gtk-sharp-2_0 = callPackage ../development/libraries/gtk-sharp/2.0.nix { - inherit (gnome2) libglade libgtkhtml gtkhtml - libgnomecanvas libgnomeui libgnomeprint - libgnomeprintui GConf; - }; + gtk-sharp-2_0 = callPackage ../development/libraries/gtk-sharp/2.0.nix { }; - gtk-sharp-3_0 = callPackage ../development/libraries/gtk-sharp/3.0.nix { - inherit (gnome2) libglade libgtkhtml gtkhtml - libgnomecanvas libgnomeui libgnomeprint - libgnomeprintui GConf; - }; + gtk-sharp-3_0 = callPackage ../development/libraries/gtk-sharp/3.0.nix { }; gtk-sharp-beans = callPackage ../development/libraries/gtk-sharp-beans { }; |