JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnome2.zenity: drop

Browse Source
This commit is contained in:
Jan Tojnar 2018-08-08 21:42:33 +02:00
parent 34aea495eb
commit 0e68d11b86
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
3 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/desktops/gnome-2/default.nix
View File

@ -84,8 +84,6 @@ let overridden = set // overrides; set = with overridden; {
# Removed from recent GNOME releases, but still required # Removed from recent GNOME releases, but still required
scrollkeeper = callPackage ./desktop/scrollkeeper { }; scrollkeeper = callPackage ./desktop/scrollkeeper { };
zenity = callPackage ./desktop/zenity { };
gnome-desktop = callPackage ./desktop/gnome-desktop { }; gnome-desktop = callPackage ./desktop/gnome-desktop { };
gtksourceview = callPackage ./desktop/gtksourceview { }; gtksourceview = callPackage ./desktop/gtksourceview { };

18
pkgs/desktops/gnome-2/desktop/zenity/default.nix
View File

@ -1,18 +0,0 @@
{ stdenv, fetchurl, pkgconfig, libxml2, libxslt, gtk
, gnome-doc-utils, intltool, libglade, libX11, which, docbook_xml_dtd_412 }:
stdenv.mkDerivation {
name = "zenity-2.32.1";
src = fetchurl {
url = mirror://gnome/sources/zenity/2.32/zenity-2.32.1.tar.bz2;
sha256 = "1b0qxb07wif0ds1pl8xk3fq9p874j89rf718lii4ndh7382bwf48";
};
configureFlags = "--disable-scrollkeeper";
buildInputs = [ gtk libglade libxml2 libxslt libX11 docbook_xml_dtd_412 ];
nativeBuildInputs = [ pkgconfig intltool gnome-doc-utils which ];
doCheck = false; # fails, tries to access the net
}

6
pkgs/top-level/all-packages.nix
View File

@ -15421,10 +15421,10 @@ with pkgs;
(callPackage ../applications/science/electronics/bitscope/packages.nix { }); (callPackage ../applications/science/electronics/bitscope/packages.nix { });
bitwig-studio1 = callPackage ../applications/audio/bitwig-studio/bitwig-studio1.nix { bitwig-studio1 = callPackage ../applications/audio/bitwig-studio/bitwig-studio1.nix {
inherit (gnome2) zenity; inherit (gnome3) zenity;
}; };
bitwig-studio2 = callPackage ../applications/audio/bitwig-studio/bitwig-studio2.nix { bitwig-studio2 = callPackage ../applications/audio/bitwig-studio/bitwig-studio2.nix {
inherit (gnome2) zenity; inherit (gnome3) zenity;
inherit (self) bitwig-studio1; inherit (self) bitwig-studio1;
}; };
bitwig-studio = bitwig-studio2; bitwig-studio = bitwig-studio2;
@ -21832,7 +21832,7 @@ with pkgs;
}); });
winetricks = callPackage ../misc/emulators/wine/winetricks.nix { winetricks = callPackage ../misc/emulators/wine/winetricks.nix {
inherit (gnome2) zenity; inherit (gnome3) zenity;
}; };
with-shell = callPackage ../applications/misc/with-shell { }; with-shell = callPackage ../applications/misc/with-shell { };