diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-02-02 00:01:49 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-02 00:01:49 +0000 |
| commit | 70961d54d612c2f905d5aaa0f3767a5795c51514 (patch) | |
| tree | 79aebe964db470c79aafc841d5949144b194ee52 /pkgs/desktops | |
| parent | e00317be13ec9230444564ec2e7eb45a3f6d3005 (diff) | |
| parent | 27249995942ba1718f7f05075d44c93bb8e0267c (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome-2/bindings/libglademm/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-2/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/desktops/xfce/default.nix | 2 |
3 files changed, 2 insertions, 22 deletions
diff --git a/pkgs/desktops/gnome-2/bindings/libglademm/default.nix b/pkgs/desktops/gnome-2/bindings/libglademm/default.nix deleted file mode 100644 index b997a9ddd1a31..0000000000000 --- a/pkgs/desktops/gnome-2/bindings/libglademm/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, pkg-config, intltool, gtkmm2, libglade }: - -stdenv.mkDerivation rec { - name = "libglademm-2.6.7"; - - src = fetchurl { - url = "mirror://gnome/sources/libglademm/2.6/${name}.tar.bz2"; - sha256 = "1hrbg9l5qb7w0xvr7013qamkckyj0fqc426c851l69zpmhakqm1q"; - }; - - outputs = [ "out" "devdoc" ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ intltool ]; - - propagatedBuildInputs = [ gtkmm2 libglade ]; -} diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 90d6fd0b7aa5f..a8ff7b58ed30f 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -62,10 +62,6 @@ lib.makeScope pkgs.newScope (self: with self; { autoreconfHook = pkgs.autoreconfHook269; }; -#### BINDINGS - - libglademm = callPackage ./bindings/libglademm { }; - } // lib.optionalAttrs (config.allowAliases or true) { inherit (pkgs) # GTK Libs @@ -89,4 +85,5 @@ lib.makeScope pkgs.newScope (self: with self; { gnome_icon_theme = self.gnome-icon-theme; gnomeicontheme = self.gnome-icon-theme; gnome_common = gnome-common; + libglademm = throw "libglademm has been removed"; # 2022-01-15 }) diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 4b057bea79464..2340a57c22d82 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -214,7 +214,7 @@ lib.makeScope pkgs.newScope (self: with self; { gtk = pkgs.gtk2; libxfcegui4 = throw "libxfcegui4 is the deprecated Xfce GUI library. It has been superseded by the libxfce4ui library"; xinitrc = xfce4-session.xinitrc; - inherit (pkgs.gnome2) libglade; + libglade = throw "libglade has been removed"; inherit (pkgs.gnome) gtksourceview; xfce4-mixer-pulse = xfce4-mixer; thunar-bare = thunar.override { |