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/default.nix | |
| parent | 51713fbbfcaf819f176df8f3ce75f57880aeb690 (diff) | |
| parent | a0070a9157d7d145eed22160cec2562d24032013 (diff) | |
| download | nixpkgs-a2c316288c8f3714e57dc1037d7a993a2088ab18.tar nixpkgs-a2c316288c8f3714e57dc1037d7a993a2088ab18.tar.gz nixpkgs-a2c316288c8f3714e57dc1037d7a993a2088ab18.tar.bz2 nixpkgs-a2c316288c8f3714e57dc1037d7a993a2088ab18.tar.lz nixpkgs-a2c316288c8f3714e57dc1037d7a993a2088ab18.tar.xz nixpkgs-a2c316288c8f3714e57dc1037d7a993a2088ab18.tar.zst nixpkgs-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/default.nix')
| -rw-r--r-- | pkgs/desktops/gnome-2/default.nix | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 50fd8344c82..6a8f9d15778 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 { }; |