git.iko.soy/typeable/nixpkgs
on master help sign in
nixos/enlightenment: fix build with config.allowAliases=false (#61421)

nixos/enlightenment: fix build with config.allowAliases=false

commitb1ee53d87bd369293db68051b67de6286acbb510 authorJan Tojnar <jtojnar@gmail.com> dateSun 16 Jun 2019, 04:07 (7 years ago) parent72291fbbfa6d56
4 files changed+8−12
nixos/modules/services/x11/desktop-managers/enlightenment.nix+1−1 nixos/modules/services/x11/desktop-managers/pantheon.nix+1−1 pkgs/desktops/gnome-3/default.nix+4−4 pkgs/top-level/all-packages.nix+2−6
nixos/modules/services/x11/desktop-managers/enlightenment.nix+1−1
@@ -34,7 +34,7 @@ in
3434 pkgs.gtk2 # To get GTK+'s themes.
3535 pkgs.tango-icon-theme
3636
37− pkgs.gnome2.gnomeicontheme
37+ pkgs.gnome2.gnome_icon_theme
3838 pkgs.xorg.xcursorthemes
3939 ];
4040
nixos/modules/services/x11/desktop-managers/pantheon.nix+1−1
@@ -195,7 +195,7 @@ in
195195 ]);
196196
197197 fonts.fonts = with pkgs; [
198− opensans-ttf
198+ open-sans
199199 roboto-mono
200200 pantheon.elementary-redacted-script # needed by screenshot-tool
201201 ];
pkgs/desktops/gnome-3/default.nix+4−4
@@ -24,10 +24,10 @@ lib.makeScope pkgs.newScope (self: with self; {
2424 corePackages = with gnome3; [
2525 pkgs.desktop-file-utils
2626 pkgs.shared-mime-info # for update-mime-database
27− glib # for gsettings
28− gtk3.out # for gtk-update-icon-cache
27+ pkgs.glib # for gsettings
28+ pkgs.gtk3.out # for gtk-update-icon-cache
2929 glib-networking gvfs dconf gnome-backgrounds gnome-control-center
30− gnome-menus gnome-settings-daemon gnome-shell
30+ pkgs.gnome-menus gnome-settings-daemon gnome-shell
3131 gnome-themes-extra adwaita-icon-theme gnome-shell-extensions
3232 pkgs.hicolor-icon-theme
3333 ];
@@ -41,7 +41,7 @@ lib.makeScope pkgs.newScope (self: with self; {
4141 nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs
4242 gnome-maps gnome-characters gnome-calendar accerciser gnome-nettool
4343 gnome-getting-started-docs gnome-packagekit gnome-software
44− gnome-power-manager gnome-todo gnome-usage
44+ gnome-power-manager gnome-todo pkgs.gnome-usage
4545 ];
4646
4747 gamesPackages = with gnome3; [ swell-foop lightsoff iagno
pkgs/top-level/all-packages.nix+2−6
@@ -11249,9 +11249,7 @@ in
1124911249
1125011250 libcdr = callPackage ../development/libraries/libcdr { lcms = lcms2; };
1125111251
11252− libchamplain = callPackage ../development/libraries/libchamplain {
11253− inherit (gnome2) libsoup;
11254− };
11252+ libchamplain = callPackage ../development/libraries/libchamplain { };
1125511253
1125611254 libchardet = callPackage ../development/libraries/libchardet { };
1125711255
@@ -13917,9 +13915,7 @@ in
1391713915
1391813916 smack = callPackage ../development/libraries/java/smack { };
1391913917
13920− swt = callPackage ../development/libraries/java/swt {
13921− inherit (gnome2) libsoup;
13922− };
13918+ swt = callPackage ../development/libraries/java/swt { };
1392313919
1392413920
1392513921 ### DEVELOPMENT / LIBRARIES / JAVASCRIPT