diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2018-08-08 21:42:33 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2018-08-09 17:36:48 +0200 |
commit | 0e68d11b86db92a00ef39035f046525f2335f1e4 (patch) | |
tree | d9bbfb3ae2b0c16bdc6eb0b74957beacd132bf89 /pkgs | |
parent | 34aea495eb39a60d0b111e748f117149cf7ac7a5 (diff) | |
download | nixlib-0e68d11b86db92a00ef39035f046525f2335f1e4.tar nixlib-0e68d11b86db92a00ef39035f046525f2335f1e4.tar.gz nixlib-0e68d11b86db92a00ef39035f046525f2335f1e4.tar.bz2 nixlib-0e68d11b86db92a00ef39035f046525f2335f1e4.tar.lz nixlib-0e68d11b86db92a00ef39035f046525f2335f1e4.tar.xz nixlib-0e68d11b86db92a00ef39035f046525f2335f1e4.tar.zst nixlib-0e68d11b86db92a00ef39035f046525f2335f1e4.zip |
gnome2.zenity: drop
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/desktops/gnome-2/default.nix | 2 | ||||
-rw-r--r-- | pkgs/desktops/gnome-2/desktop/zenity/default.nix | 18 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
3 files changed, 3 insertions, 23 deletions
diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 2b4a8562c4f4..7e98973c4d2f 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -84,8 +84,6 @@ let overridden = set // overrides; set = with overridden; { # Removed from recent GNOME releases, but still required scrollkeeper = callPackage ./desktop/scrollkeeper { }; - zenity = callPackage ./desktop/zenity { }; - gnome-desktop = callPackage ./desktop/gnome-desktop { }; gtksourceview = callPackage ./desktop/gtksourceview { }; diff --git a/pkgs/desktops/gnome-2/desktop/zenity/default.nix b/pkgs/desktops/gnome-2/desktop/zenity/default.nix deleted file mode 100644 index 0233f6340f55..000000000000 --- a/pkgs/desktops/gnome-2/desktop/zenity/default.nix +++ /dev/null @@ -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 -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d2089a484dd..97219c8a9228 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15421,10 +15421,10 @@ with pkgs; (callPackage ../applications/science/electronics/bitscope/packages.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 { - inherit (gnome2) zenity; + inherit (gnome3) zenity; inherit (self) bitwig-studio1; }; bitwig-studio = bitwig-studio2; @@ -21832,7 +21832,7 @@ with pkgs; }); winetricks = callPackage ../misc/emulators/wine/winetricks.nix { - inherit (gnome2) zenity; + inherit (gnome3) zenity; }; with-shell = callPackage ../applications/misc/with-shell { }; |