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 /pkgs/desktops/gnome-2 | |
| 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
Diffstat (limited to 'pkgs/desktops/gnome-2')
| -rw-r--r-- | pkgs/desktops/gnome-2/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-2/desktop/rarian/default.nix | 12 |
2 files changed, 2 insertions, 16 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"; -} |