From 46b9e5c3d4a2fa8f69da8a7d913f6751c5ecb58e Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Mon, 13 May 2019 03:50:52 +0000
Subject: [PATCH 1/4] nixos/enlightenment: fix build with
config.allowAliases=false
---
nixos/modules/services/x11/desktop-managers/enlightenment.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
index 04e380b61530..5c6028fd2e11 100644
--- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix
+++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
@@ -34,7 +34,7 @@ in
pkgs.gtk2 # To get GTK+'s themes.
pkgs.tango-icon-theme
- pkgs.gnome2.gnomeicontheme
+ pkgs.gnome2.gnome_icon_theme
pkgs.xorg.xcursorthemes
];
From d7decccc2864968afa772e4b23606cee005f30e6 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Mon, 13 May 2019 04:48:55 +0000
Subject: [PATCH 2/4] nixos/pantheon: fix build with config.allowAliases=false
---
nixos/modules/services/x11/desktop-managers/pantheon.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix
index e1eeb32aa1a0..a861b122d5d9 100644
--- a/nixos/modules/services/x11/desktop-managers/pantheon.nix
+++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix
@@ -190,7 +190,7 @@ in
]);
fonts.fonts = with pkgs; [
- opensans-ttf
+ open-sans
roboto-mono
pantheon.elementary-redacted-script # needed by screenshot-tool
];
From 9bb2c3f0aadcdd0694e09fc6449e9eea098af968 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Mon, 13 May 2019 04:55:05 +0000
Subject: [PATCH 3/4] fix build with config.allowAliases=false
---
pkgs/top-level/all-packages.nix | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0ac118e77552..f616e92dc240 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11136,9 +11136,7 @@ in
libcdr = callPackage ../development/libraries/libcdr { lcms = lcms2; };
- libchamplain = callPackage ../development/libraries/libchamplain {
- inherit (gnome2) libsoup;
- };
+ libchamplain = callPackage ../development/libraries/libchamplain { };
libchardet = callPackage ../development/libraries/libchardet { };
@@ -13791,9 +13789,7 @@ in
smack = callPackage ../development/libraries/java/smack { };
- swt = callPackage ../development/libraries/java/swt {
- inherit (gnome2) libsoup;
- };
+ swt = callPackage ../development/libraries/java/swt { };
### DEVELOPMENT / LIBRARIES / JAVASCRIPT
From bfa6d562b244f0c5610b7502750fbb00046d2c21 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Mon, 13 May 2019 13:16:28 +0000
Subject: [PATCH 4/4] gnome3: fix build with config.allowAliases=false
---
pkgs/desktops/gnome-3/default.nix | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 8680e3ed81da..b6f5a50d8b55 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -24,10 +24,10 @@ lib.makeScope pkgs.newScope (self: with self; {
corePackages = with gnome3; [
pkgs.desktop-file-utils
pkgs.shared-mime-info # for update-mime-database
- glib # for gsettings
- gtk3.out # for gtk-update-icon-cache
+ pkgs.glib # for gsettings
+ pkgs.gtk3.out # for gtk-update-icon-cache
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
pkgs.hicolor-icon-theme
];
@@ -41,7 +41,7 @@ lib.makeScope pkgs.newScope (self: with self; {
nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs
gnome-maps gnome-characters gnome-calendar accerciser gnome-nettool
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