diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2018-04-25 15:52:09 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2018-04-25 15:53:26 +0200 |
commit | 0dec4fa1dbbf10f4a59fba522c24dbea0ba6e9fc (patch) | |
tree | 164f99131b4ed4af2a2399c55dd850c6aff2968f | |
parent | 4d40adb86d03b856e12984048ced8902e3f73fd3 (diff) | |
download | nixlib-0dec4fa1dbbf10f4a59fba522c24dbea0ba6e9fc.tar nixlib-0dec4fa1dbbf10f4a59fba522c24dbea0ba6e9fc.tar.gz nixlib-0dec4fa1dbbf10f4a59fba522c24dbea0ba6e9fc.tar.bz2 nixlib-0dec4fa1dbbf10f4a59fba522c24dbea0ba6e9fc.tar.lz nixlib-0dec4fa1dbbf10f4a59fba522c24dbea0ba6e9fc.tar.xz nixlib-0dec4fa1dbbf10f4a59fba522c24dbea0ba6e9fc.tar.zst nixlib-0dec4fa1dbbf10f4a59fba522c24dbea0ba6e9fc.zip |
rarian: merge gnome{2,3}.rarian
-rw-r--r-- | pkgs/desktops/gnome-2/default.nix | 6 | ||||
-rw-r--r-- | pkgs/desktops/gnome-2/desktop/rarian/default.nix | 12 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/rarian/default.nix (renamed from pkgs/desktops/gnome-3/desktop/rarian/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
5 files changed, 5 insertions, 19 deletions
diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index cc4536785251..80f2c9ce70d7 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -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 { }; diff --git a/pkgs/desktops/gnome-2/desktop/rarian/default.nix b/pkgs/desktops/gnome-2/desktop/rarian/default.nix deleted file mode 100644 index d2bcaa7c5e10..000000000000 --- a/pkgs/desktops/gnome-2/desktop/rarian/default.nix +++ /dev/null @@ -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"; -} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index f35688888997..422dedbce853 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -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 diff --git a/pkgs/desktops/gnome-3/desktop/rarian/default.nix b/pkgs/development/libraries/rarian/default.nix index 484e58568721..484e58568721 100644 --- a/pkgs/desktops/gnome-3/desktop/rarian/default.nix +++ b/pkgs/development/libraries/rarian/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e66f1ead518..eaa458529e3c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |