rarian: merge gnome{2,3}.rarian
This commit is contained in:
parent
4d40adb86d
commit
0dec4fa1db
|
@ -1,4 +1,4 @@
|
|||
{ callPackage, self, stdenv, gettext, gvfs, libunique, bison2
|
||||
{ callPackage, self, stdenv, gettext, gvfs, libunique, bison2, rarian
|
||||
, libstartup_notification, overrides ? {} }:
|
||||
|
||||
let overridden = set // overrides; set = with overridden; {
|
||||
|
@ -14,6 +14,7 @@ let overridden = set // overrides; set = with overridden; {
|
|||
gnome_desktop = gnome-desktop;
|
||||
gnome_settings_daemon = gnome-settings-daemon;
|
||||
gnome_control_center = gnome-control-center;
|
||||
inherit rarian;
|
||||
|
||||
#### PLATFORM
|
||||
|
||||
|
@ -93,9 +94,6 @@ let overridden = set // overrides; set = with overridden; {
|
|||
# Removed from recent GNOME releases, but still required
|
||||
scrollkeeper = callPackage ./desktop/scrollkeeper { };
|
||||
|
||||
# scrollkeeper replacement
|
||||
rarian = callPackage ./desktop/rarian { };
|
||||
|
||||
zenity = callPackage ./desktop/zenity { };
|
||||
|
||||
metacity = callPackage ./desktop/metacity { };
|
||||
|
|
|
@ -1,12 +0,0 @@
|
|||
{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "rarian-0.8.1";
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/rarian/0.8/${name}.tar.bz2";
|
||||
sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577";
|
||||
};
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ perl perlXMLParser libxml2 libxslt];
|
||||
configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat";
|
||||
}
|
|
@ -311,9 +311,6 @@ let
|
|||
|
||||
polari = callPackage ./apps/polari { };
|
||||
|
||||
# scrollkeeper replacement
|
||||
rarian = callPackage ./desktop/rarian { };
|
||||
|
||||
seahorse = callPackage ./apps/seahorse { };
|
||||
|
||||
vinagre = callPackage ./apps/vinagre { };
|
||||
|
@ -427,6 +424,7 @@ let
|
|||
libcanberra_gtk2 = libcanberra-gtk2; # added 2018-02-25
|
||||
libgames-support = libgnome-games-support; # added 2018-03-14
|
||||
libgnome_keyring = libgnome-keyring; # added 2018-02-25
|
||||
inherit (pkgs) rarian; # added 2018-04-25
|
||||
networkmanager_fortisslvpn = networkmanager-fortisslvpn; # added 2018-02-25
|
||||
networkmanager_iodine = networkmanager-iodine; # added 2018-02-25
|
||||
networkmanager_l2tp = networkmanager-l2tp; # added 2018-02-25
|
||||
|
|
|
@ -4560,6 +4560,8 @@ with pkgs;
|
|||
|
||||
rarcrack = callPackage ../tools/security/rarcrack { };
|
||||
|
||||
rarian = callPackage ../development/libraries/rarian { };
|
||||
|
||||
ratools = callPackage ../tools/networking/ratools { };
|
||||
|
||||
rawdog = callPackage ../applications/networking/feedreaders/rawdog { };
|
||||
|
|
Loading…
Reference in a new issue