public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/enlightenment: fix build with config.allowAliases=false (#61421)

Browse Source 
nixos/enlightenment: fix build with config.allowAliases=false
This commit is contained in:
Jan Tojnar 2019-06-16 04:07:26 +02:00 committed by GitHub
commit b1ee53d87b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/x11/desktop-managers/enlightenment.nix
View File

@ -34,7 +34,7 @@ in
pkgs.gtk2 # To get GTK+'s themes. pkgs.gtk2 # To get GTK+'s themes.
pkgs.tango-icon-theme pkgs.tango-icon-theme
pkgs.gnome2.gnomeicontheme pkgs.gnome2.gnome_icon_theme
pkgs.xorg.xcursorthemes pkgs.xorg.xcursorthemes
]; ];

2
nixos/modules/services/x11/desktop-managers/pantheon.nix
View File

@ -195,7 +195,7 @@ in
]); ]);
fonts.fonts = with pkgs; [ fonts.fonts = with pkgs; [
opensans-ttf open-sans
roboto-mono roboto-mono
pantheon.elementary-redacted-script # needed by screenshot-tool pantheon.elementary-redacted-script # needed by screenshot-tool
]; ];

8
pkgs/desktops/gnome-3/default.nix
View File

@ -24,10 +24,10 @@ lib.makeScope pkgs.newScope (self: with self; {
corePackages = with gnome3; [ corePackages = with gnome3; [
pkgs.desktop-file-utils pkgs.desktop-file-utils
pkgs.shared-mime-info # for update-mime-database pkgs.shared-mime-info # for update-mime-database
glib # for gsettings pkgs.glib # for gsettings
gtk3.out # for gtk-update-icon-cache pkgs.gtk3.out # for gtk-update-icon-cache
glib-networking gvfs dconf gnome-backgrounds gnome-control-center glib-networking gvfs dconf gnome-backgrounds gnome-control-center
gnome-menus gnome-settings-daemon gnome-shell pkgs.gnome-menus gnome-settings-daemon gnome-shell
gnome-themes-extra adwaita-icon-theme gnome-shell-extensions gnome-themes-extra adwaita-icon-theme gnome-shell-extensions
pkgs.hicolor-icon-theme pkgs.hicolor-icon-theme
]; ];
@ -41,7 +41,7 @@ lib.makeScope pkgs.newScope (self: with self; {
nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs
gnome-maps gnome-characters gnome-calendar accerciser gnome-nettool gnome-maps gnome-characters gnome-calendar accerciser gnome-nettool
gnome-getting-started-docs gnome-packagekit gnome-software gnome-getting-started-docs gnome-packagekit gnome-software
gnome-power-manager gnome-todo gnome-usage gnome-power-manager gnome-todo pkgs.gnome-usage
]; ];
gamesPackages = with gnome3; [ swell-foop lightsoff iagno gamesPackages = with gnome3; [ swell-foop lightsoff iagno

8
pkgs/top-level/all-packages.nix
View File

@ -11249,9 +11249,7 @@ in
libcdr = callPackage ../development/libraries/libcdr { lcms = lcms2; }; libcdr = callPackage ../development/libraries/libcdr { lcms = lcms2; };
libchamplain = callPackage ../development/libraries/libchamplain { libchamplain = callPackage ../development/libraries/libchamplain { };
inherit (gnome2) libsoup;
};
libchardet = callPackage ../development/libraries/libchardet { }; libchardet = callPackage ../development/libraries/libchardet { };
@ -13917,9 +13915,7 @@ in
smack = callPackage ../development/libraries/java/smack { }; smack = callPackage ../development/libraries/java/smack { };
swt = callPackage ../development/libraries/java/swt { swt = callPackage ../development/libraries/java/swt { };
inherit (gnome2) libsoup;
};
### DEVELOPMENT / LIBRARIES / JAVASCRIPT ### DEVELOPMENT / LIBRARIES / JAVASCRIPT