diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-12 10:33:41 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-12 10:33:41 +0200 |
commit | 00df25ee57fcc2227ffdbbff2280b13d898bfd7d (patch) | |
tree | a2cdc854489799c6d7900b0e5ac215b7b95d762a /pkgs/desktops/gnome-3/default.nix | |
parent | 580cab57e4f188d25144e398d7b8e3d5085299a9 (diff) | |
parent | bb3f7d14a17e88e4341872c55d8b32127c6f8101 (diff) | |
download | nixpkgs-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar nixpkgs-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar.gz nixpkgs-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar.bz2 nixpkgs-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar.lz nixpkgs-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar.xz nixpkgs-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar.zst nixpkgs-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.zip |
Merge branch 'master' into staging-next
Hydra: ?compare=1472947
Diffstat (limited to 'pkgs/desktops/gnome-3/default.nix')
-rw-r--r-- | pkgs/desktops/gnome-3/default.nix | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index ce542e7f88b..478dfc5d9f4 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -187,31 +187,31 @@ lib.makeScope pkgs.newScope (self: with self; { nautilus = callPackage ./core/nautilus { }; networkmanager-openvpn = pkgs.networkmanager-openvpn.override { - inherit gnome3; + withGnome = true; }; networkmanager-vpnc = pkgs.networkmanager-vpnc.override { - inherit gnome3; + withGnome = true; }; networkmanager-openconnect = pkgs.networkmanager-openconnect.override { - inherit gnome3; + withGnome = true; }; networkmanager-fortisslvpn = pkgs.networkmanager-fortisslvpn.override { - inherit gnome3; + withGnome = true; }; networkmanager-l2tp = pkgs.networkmanager-l2tp.override { - inherit gnome3; + withGnome = true; }; networkmanager-iodine = pkgs.networkmanager-iodine.override { - inherit gnome3; + withGnome = true; }; networkmanagerapplet = pkgs.networkmanagerapplet.override { - inherit gnome3 gsettings-desktop-schemas glib-networking; + withGnome = true; }; rest = callPackage ./core/rest { }; @@ -373,10 +373,18 @@ lib.makeScope pkgs.newScope (self: with self; { gexiv2 = callPackage ./misc/gexiv2 { }; + gnome-applets = callPackage ./misc/gnome-applets { }; + + gnome-flashback = callPackage ./misc/gnome-flashback { }; + + gnome-panel = callPackage ./misc/gnome-panel { }; + gnome-tweaks = callPackage ./misc/gnome-tweaks { }; gpaste = callPackage ./misc/gpaste { }; + metacity = callPackage ./misc/metacity { }; + pidgin-im-gnome-shell-extension = callPackage ./misc/pidgin { }; gtkhtml = callPackage ./misc/gtkhtml { }; |