diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-01-12 12:27:06 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-01-12 12:29:24 +0100 |
commit | a2c316288c8f3714e57dc1037d7a993a2088ab18 (patch) | |
tree | ee4af0b96a5bc0e55b92c8d76465b333a698a260 /pkgs/desktops/gnome-2 | |
parent | 51713fbbfcaf819f176df8f3ce75f57880aeb690 (diff) | |
parent | a0070a9157d7d145eed22160cec2562d24032013 (diff) | |
download | nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.tar nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.tar.gz nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.tar.bz2 nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.tar.lz nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.tar.xz nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.tar.zst nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.zip |
Merge master into stdenv-updates
Conflicts: pkgs/development/lisp-modules/stumpwm/default.nix (auto-solved) pkgs/top-level/all-packages.nix (trivial)
Diffstat (limited to 'pkgs/desktops/gnome-2')
-rw-r--r-- | pkgs/desktops/gnome-2/default.nix | 2 | ||||
-rw-r--r-- | pkgs/desktops/gnome-2/desktop/nautilus/default.nix | 10 |
2 files changed, 0 insertions, 12 deletions
diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 50fd8344c829..6a8f9d157787 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -107,8 +107,6 @@ let overridden = set // overrides; set = with overridden; { gtksourceview = callPackage ./desktop/gtksourceview { }; - nautilus = callPackage ./desktop/nautilus { }; - gnome_icon_theme = callPackage ./desktop/gnome-icon-theme { }; vte = callPackage ./desktop/vte { }; diff --git a/pkgs/desktops/gnome-2/desktop/nautilus/default.nix b/pkgs/desktops/gnome-2/desktop/nautilus/default.nix deleted file mode 100644 index 3765e6112d68..000000000000 --- a/pkgs/desktops/gnome-2/desktop/nautilus/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{stdenv, fetchurl, pkgconfig, libxml2, dbus_glib, shared_mime_info, libexif, gtk, gnome_desktop, libunique, intltool, GConf}: - -stdenv.mkDerivation { - name = "nautilus-2.28.0"; - src = fetchurl { - url = mirror://gnome/sources/nautilus/2.28/nautilus-2.28.0.tar.bz2; - sha256 = "0wmskjxf231r2vra22zy02561gh5q10pj3lhzya13dvlliyv4q9p"; - }; - buildInputs = [ pkgconfig libxml2 dbus_glib shared_mime_info libexif gtk gnome_desktop libunique intltool GConf ]; -} |