From 14f1ff80ce42fcfb4ee8e85e7882b3fac8f97cde Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Fri, 19 Feb 2016 11:32:01 +0100 Subject: gnome3.eog: 3.18.1 -> 3.18.2 --- pkgs/desktops/gnome-3/3.18/core/eog/src.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/desktops/gnome-3') diff --git a/pkgs/desktops/gnome-3/3.18/core/eog/src.nix b/pkgs/desktops/gnome-3/3.18/core/eog/src.nix index 937f1dcaa215..444d66fbb31a 100644 --- a/pkgs/desktops/gnome-3/3.18/core/eog/src.nix +++ b/pkgs/desktops/gnome-3/3.18/core/eog/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "eog-3.18.1"; + name = "eog-3.18.2"; src = fetchurl { - url = mirror://gnome/sources/eog/3.18/eog-3.18.1.tar.xz; - sha256 = "7b7bb47a680518701e2e724c8632fcf12dcb3c3e45ce1f2bdd4c4ace325793a7"; + url = mirror://gnome/sources/eog/3.18/eog-3.18.2.tar.xz; + sha256 = "dc2d16e3754cad12703261fe586e7599c4df2e39282f6c28681a514f749fe636"; }; } -- cgit 1.4.1 From 6d6a7881efea68cadd1237a4c3f0bb652a7157b1 Mon Sep 17 00:00:00 2001 From: Michael Raitza Date: Fri, 19 Feb 2016 20:11:28 +0100 Subject: gnome3.libgxps: Fix dependency propagation bug Packages that want to use libgxps also need libarchive, thus it is moved to propagatedBuildInputs. --- pkgs/desktops/gnome-3/3.18/core/libgxps/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs/desktops/gnome-3') diff --git a/pkgs/desktops/gnome-3/3.18/core/libgxps/default.nix b/pkgs/desktops/gnome-3/3.18/core/libgxps/default.nix index 72d307f4f1a7..5168dec203fa 100644 --- a/pkgs/desktops/gnome-3/3.18/core/libgxps/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/libgxps/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1gi0b0x0354jyqc48vspk2hg2q1403cf2p9ibj847nzhkdrh9l9r"; }; - buildInputs = [ pkgconfig glib cairo libarchive freetype libjpeg libtiff acl openssl bzip2 attr]; + buildInputs = [ pkgconfig glib cairo freetype libjpeg libtiff acl openssl bzip2 attr]; + propagatedBuildInputs = [ libarchive ]; configureFlags = "--without-liblcms2"; -- cgit 1.4.1 From 58cbe7d068ceb54951ba8fb68b31ba7c86c0a9cc Mon Sep 17 00:00:00 2001 From: Michael Raitza Date: Fri, 19 Feb 2016 20:15:19 +0100 Subject: gnome3.evince: Add XPS file support XPS support is optional via supportXPS argument and turned off by default. --- pkgs/desktops/gnome-3/3.18/core/evince/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'pkgs/desktops/gnome-3') diff --git a/pkgs/desktops/gnome-3/3.18/core/evince/default.nix b/pkgs/desktops/gnome-3/3.18/core/evince/default.nix index 154182eef887..3220e9060643 100644 --- a/pkgs/desktops/gnome-3/3.18/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/evince/default.nix @@ -1,8 +1,9 @@ { fetchurl, stdenv, pkgconfig, intltool, perl, perlXMLParser, libxml2 , glib, gtk3, pango, atk, gdk_pixbuf, shared_mime_info, itstool, gnome3 , poppler, ghostscriptX, djvulibre, libspectre, libsecret , makeWrapper -, librsvg, recentListSize ? null # 5 is not enough, allow passing a different number -, gobjectIntrospection +, librsvg, gobjectIntrospection +, recentListSize ? null # 5 is not enough, allow passing a different number +, supportXPS ? false # Open XML Paper Specification via libgxps }: stdenv.mkDerivation rec { @@ -15,11 +16,12 @@ stdenv.mkDerivation rec { gnome3.libgnome_keyring gnome3.gsettings_desktop_schemas poppler ghostscriptX djvulibre libspectre makeWrapper libsecret librsvg gnome3.adwaita-icon-theme - ]; + ] ++ stdenv.lib.optional supportXPS gnome3.libgxps; configureFlags = [ "--disable-nautilus" # Do not use nautilus "--enable-introspection" + (if supportXPS then "--enable-xps" else "--disable-xps") ]; NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; -- cgit 1.4.1 From ce7aa7188045e2e646d199b7ea6e3dd64d056865 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Thu, 25 Feb 2016 19:07:46 -0500 Subject: vte-ng: 0.42.1.a -> 0.42.4.a --- pkgs/desktops/gnome-3/3.18/core/vte/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/desktops/gnome-3') diff --git a/pkgs/desktops/gnome-3/3.18/core/vte/default.nix b/pkgs/desktops/gnome-3/3.18/core/vte/default.nix index 86dfd953b48f..334718403a0d 100644 --- a/pkgs/desktops/gnome-3/3.18/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/vte/default.nix @@ -43,12 +43,12 @@ let baseAttrs = rec { in stdenv.mkDerivation ( baseAttrs // stdenv.lib.optionalAttrs selectTextPatch rec { name = "vte-ng-${version}"; - version = "0.42.1.a"; + version = "0.42.4.a"; src = fetchFromGitHub { owner = "thestinger"; repo = "vte-ng"; rev = version; - sha256 = "1296rvngixi6l31mhhaks6vr1xyqw8h6n5hwknadrlk95nknrpxm"; + sha256 = "1w91lz30j5lrskp9ds5j3nn27m5mpdpn7nlcvf5y1w63mpmjg8k1"; }; # slightly hacky; I couldn't make it work with autoreconfHook configureScript = "./autogen.sh"; -- cgit 1.4.1 From aa9576bceb56d4fe2fb24e6fb47001817baeab34 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 8 Oct 2015 14:53:37 +0200 Subject: installer: add graphical GNOME iso --- .../cd-dvd/installation-cd-graphical-gnome.nix | 78 +++++++++++++++ .../installation-cd-graphical-kde-new-kernel.nix | 7 ++ .../cd-dvd/installation-cd-graphical-kde.nix | 110 +++++++++++++++++++++ .../installation-cd-graphical-new-kernel.nix | 7 -- .../installer/cd-dvd/installation-cd-graphical.nix | 110 --------------------- .../services/x11/desktop-managers/gnome3.nix | 57 +++++++---- nixos/release.nix | 2 +- .../gnome-3/3.18/core/gnome-shell/default.nix | 3 +- .../gnome-3/3.18/core/nautilus/default.nix | 3 +- pkgs/desktops/gnome-3/3.18/default.nix | 3 + pkgs/desktops/gnome-3/3.18/installer.nix | 15 +++ 11 files changed, 256 insertions(+), 139 deletions(-) create mode 100644 nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix create mode 100644 nixos/modules/installer/cd-dvd/installation-cd-graphical-kde-new-kernel.nix create mode 100644 nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix delete mode 100644 nixos/modules/installer/cd-dvd/installation-cd-graphical-new-kernel.nix delete mode 100644 nixos/modules/installer/cd-dvd/installation-cd-graphical.nix create mode 100644 pkgs/desktops/gnome-3/3.18/installer.nix (limited to 'pkgs/desktops/gnome-3') diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix new file mode 100644 index 000000000000..5725938465f5 --- /dev/null +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix @@ -0,0 +1,78 @@ +# This module defines a NixOS installation CD that contains X11 and +# GNOME 3. + +{ config, lib, pkgs, ... }: + +with lib; + +{ + imports = [ ./installation-cd-base.nix ]; + + services.xserver = { + enable = true; + # GDM doesn't start in virtual machines with ISO + displayManager.slim = { + enable = true; + defaultUser = "root"; + autoLogin = true; + }; + desktopManager.gnome3 = { + enable = true; + extraGSettingsOverrides = '' + [org.gnome.desktop.background] + show-desktop-icons=true + + [org.gnome.nautilus.desktop] + trash-icon-visible=false + volumes-visible=false + home-icon-visible=false + network-icon-visible=false + ''; + + extraGSettingsOverridePackages = [ pkgs.gnome3.nautilus ]; + }; + }; + + environment.systemPackages = + [ # Include gparted for partitioning disks. + pkgs.gparted + + # Include some editors. + pkgs.vim + pkgs.bvi # binary editor + pkgs.joe + + pkgs.glxinfo + ]; + + # Don't start the X server by default. + services.xserver.autorun = mkForce false; + + # Auto-login as root. + services.xserver.displayManager.gdm.autoLogin = { + enable = true; + user = "root"; + }; + + system.activationScripts.installerDesktop = let + # Must be executable + desktopFile = pkgs.writeScript "nixos-manual.desktop" '' + [Desktop Entry] + Version=1.0 + Type=Link + Name=NixOS Manual + URL=${config.system.build.manual.manual}/share/doc/nixos/index.html + Icon=system-help + ''; + + # use cp and chmod +x, we must be sure the apps are in the nix store though + in '' + mkdir -p /root/Desktop + ln -sfT ${desktopFile} /root/Desktop/nixos-manual.desktop + cp ${pkgs.gnome3.gnome_terminal}/share/applications/gnome-terminal.desktop /root/Desktop/gnome-terminal.desktop + chmod a+rx /root/Desktop/gnome-terminal.desktop + cp ${pkgs.gparted}/share/applications/gparted.desktop /root/Desktop/gparted.desktop + chmod a+rx /root/Desktop/gparted.desktop + ''; + +} diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde-new-kernel.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde-new-kernel.nix new file mode 100644 index 000000000000..a4bcd7079a4f --- /dev/null +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde-new-kernel.nix @@ -0,0 +1,7 @@ +{ config, pkgs, ... }: + +{ + imports = [ ./installation-cd-graphical-kde.nix ]; + + boot.kernelPackages = pkgs.linuxPackages_latest; +} diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix new file mode 100644 index 000000000000..d14768bc1079 --- /dev/null +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix @@ -0,0 +1,110 @@ +# This module defines a NixOS installation CD that contains X11 and +# KDE 4. + +{ config, lib, pkgs, ... }: + +with lib; + +{ + imports = [ ./installation-cd-base.nix ../../profiles/graphical.nix ]; + + # Provide wicd for easy wireless configuration. + #networking.wicd.enable = true; + + environment.systemPackages = + [ # Include gparted for partitioning disks. + pkgs.gparted + + # Include some editors. + pkgs.vim + pkgs.bvi # binary editor + pkgs.joe + ]; + + # Provide networkmanager for easy wireless configuration. + networking.networkmanager.enable = true; + networking.wireless.enable = mkForce false; + + # KDE complains if power management is disabled (to be precise, if + # there is no power management backend such as upower). + powerManagement.enable = true; + + # Don't start the X server by default. + services.xserver.autorun = mkForce false; + + # Auto-login as root. + services.xserver.displayManager.kdm.extraConfig = + '' + [X-*-Core] + AllowRootLogin=true + AutoLoginEnable=true + AutoLoginUser=root + AutoLoginPass="" + ''; + + # Custom kde-workspace adding some icons on the desktop + + system.activationScripts.installerDesktop = let + openManual = pkgs.writeScript "nixos-manual.sh" '' + #!${pkgs.stdenv.shell} + cd ${config.system.build.manual.manual}/share/doc/nixos/ + konqueror ./index.html + ''; + + desktopFile = pkgs.writeText "nixos-manual.desktop" '' + [Desktop Entry] + Version=1.0 + Type=Application + Name=NixOS Manual + Exec=${openManual} + Icon=konqueror + ''; + + in '' + mkdir -p /root/Desktop + ln -sfT ${desktopFile} /root/Desktop/nixos-manual.desktop + ln -sfT ${pkgs.kde4.konsole}/share/applications/kde4/konsole.desktop /root/Desktop/konsole.desktop + ln -sfT ${pkgs.gparted}/share/applications/gparted.desktop /root/Desktop/gparted.desktop + ''; + + services.xserver.desktopManager.kde4.kdeWorkspacePackage = let + pkg = pkgs.kde4.kde_workspace; + + plasmaInit = pkgs.writeText "00-defaultLayout.js" '' + loadTemplate("org.kde.plasma-desktop.defaultPanel") + + for (var i = 0; i < screenCount; ++i) { + var desktop = new Activity + desktop.name = i18n("Desktop") + desktop.screen = i + desktop.wallpaperPlugin = 'image' + desktop.wallpaperMode = 'SingleImage' + + var folderview = desktop.addWidget("folderview"); + folderview.writeConfig("url", "desktop:/"); + + //Create more panels for other screens + if (i > 0){ + var panel = new Panel + panel.screen = i + panel.location = 'bottom' + panel.height = screenGeometry(i).height > 1024 ? 35 : 27 + var tasks = panel.addWidget("tasks") + tasks.writeConfig("showOnlyCurrentScreen", true); + } + } + ''; + + in + pkgs.stdenv.mkDerivation { + inherit (pkg) name meta; + + buildCommand = '' + mkdir -p $out + cp -prf ${pkg}/* $out/ + chmod a+w $out/share/apps/plasma-desktop/init + cp -f ${plasmaInit} $out/share/apps/plasma-desktop/init/00-defaultLayout.js + ''; + }; + +} diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-new-kernel.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-new-kernel.nix deleted file mode 100644 index 506b9292b01e..000000000000 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-new-kernel.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ config, pkgs, ... }: - -{ - imports = [ ./installation-cd-graphical.nix ]; - - boot.kernelPackages = pkgs.linuxPackages_latest; -} diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical.nix deleted file mode 100644 index d14768bc1079..000000000000 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical.nix +++ /dev/null @@ -1,110 +0,0 @@ -# This module defines a NixOS installation CD that contains X11 and -# KDE 4. - -{ config, lib, pkgs, ... }: - -with lib; - -{ - imports = [ ./installation-cd-base.nix ../../profiles/graphical.nix ]; - - # Provide wicd for easy wireless configuration. - #networking.wicd.enable = true; - - environment.systemPackages = - [ # Include gparted for partitioning disks. - pkgs.gparted - - # Include some editors. - pkgs.vim - pkgs.bvi # binary editor - pkgs.joe - ]; - - # Provide networkmanager for easy wireless configuration. - networking.networkmanager.enable = true; - networking.wireless.enable = mkForce false; - - # KDE complains if power management is disabled (to be precise, if - # there is no power management backend such as upower). - powerManagement.enable = true; - - # Don't start the X server by default. - services.xserver.autorun = mkForce false; - - # Auto-login as root. - services.xserver.displayManager.kdm.extraConfig = - '' - [X-*-Core] - AllowRootLogin=true - AutoLoginEnable=true - AutoLoginUser=root - AutoLoginPass="" - ''; - - # Custom kde-workspace adding some icons on the desktop - - system.activationScripts.installerDesktop = let - openManual = pkgs.writeScript "nixos-manual.sh" '' - #!${pkgs.stdenv.shell} - cd ${config.system.build.manual.manual}/share/doc/nixos/ - konqueror ./index.html - ''; - - desktopFile = pkgs.writeText "nixos-manual.desktop" '' - [Desktop Entry] - Version=1.0 - Type=Application - Name=NixOS Manual - Exec=${openManual} - Icon=konqueror - ''; - - in '' - mkdir -p /root/Desktop - ln -sfT ${desktopFile} /root/Desktop/nixos-manual.desktop - ln -sfT ${pkgs.kde4.konsole}/share/applications/kde4/konsole.desktop /root/Desktop/konsole.desktop - ln -sfT ${pkgs.gparted}/share/applications/gparted.desktop /root/Desktop/gparted.desktop - ''; - - services.xserver.desktopManager.kde4.kdeWorkspacePackage = let - pkg = pkgs.kde4.kde_workspace; - - plasmaInit = pkgs.writeText "00-defaultLayout.js" '' - loadTemplate("org.kde.plasma-desktop.defaultPanel") - - for (var i = 0; i < screenCount; ++i) { - var desktop = new Activity - desktop.name = i18n("Desktop") - desktop.screen = i - desktop.wallpaperPlugin = 'image' - desktop.wallpaperMode = 'SingleImage' - - var folderview = desktop.addWidget("folderview"); - folderview.writeConfig("url", "desktop:/"); - - //Create more panels for other screens - if (i > 0){ - var panel = new Panel - panel.screen = i - panel.location = 'bottom' - panel.height = screenGeometry(i).height > 1024 ? 35 : 27 - var tasks = panel.addWidget("tasks") - tasks.writeConfig("showOnlyCurrentScreen", true); - } - } - ''; - - in - pkgs.stdenv.mkDerivation { - inherit (pkg) name meta; - - buildCommand = '' - mkdir -p $out - cp -prf ${pkg}/* $out/ - chmod a+w $out/share/apps/plasma-desktop/init - cp -f ${plasmaInit} $out/share/apps/plasma-desktop/init/00-defaultLayout.js - ''; - }; - -} diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 4dd631d87511..be7700424bc6 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -27,19 +27,24 @@ let nixos-gsettings-desktop-schemas = pkgs.stdenv.mkDerivation { name = "nixos-gsettings-desktop-schemas"; - buildInputs = [ pkgs.nixos-artwork ]; buildCommand = '' - mkdir -p $out/share/nixos-gsettings-schemas/nixos-gsettings-desktop-schemas - cp -rf ${gnome3.gsettings_desktop_schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0 $out/share/nixos-gsettings-schemas/nixos-gsettings-desktop-schemas/ - chmod -R a+w $out/share/nixos-gsettings-schemas/nixos-gsettings-desktop-schemas - cat - > $out/share/nixos-gsettings-schemas/nixos-gsettings-desktop-schemas/glib-2.0/schemas/nixos-defaults.gschema.override <<- EOF + mkdir -p $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas + cp -rf ${gnome3.gsettings_desktop_schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas + + ${concatMapStrings (pkg: "cp -rf ${pkg}/share/gsettings-schemas/*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas\n") cfg.extraGSettingsOverridePackages} + + chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides + cat - > $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/nixos-defaults.gschema.override <<- EOF [org.gnome.desktop.background] picture-uri='${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png' [org.gnome.desktop.screensaver] picture-uri='${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png' + + ${cfg.extraGSettingsOverrides} EOF - ${pkgs.glib}/bin/glib-compile-schemas $out/share/nixos-gsettings-schemas/nixos-gsettings-desktop-schemas/glib-2.0/schemas/ + + ${pkgs.glib}/bin/glib-compile-schemas $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/ ''; }; @@ -47,19 +52,33 @@ in { options = { - services.xserver.desktopManager.gnome3.enable = mkOption { - default = false; - example = true; - description = "Enable Gnome 3 desktop manager."; - }; + services.xserver.desktopManager.gnome3 = { + enable = mkOption { + default = false; + example = true; + description = "Enable Gnome 3 desktop manager."; + }; - services.xserver.desktopManager.gnome3.sessionPath = mkOption { - default = []; - example = literalExample "[ pkgs.gnome3.gpaste ]"; - description = "Additional list of packages to be added to the session search path. - Useful for gnome shell extensions or gsettings-conditionated autostart."; - apply = list: list ++ [ gnome3.gnome_shell gnome3.gnome-shell-extensions ]; - }; + sessionPath = mkOption { + default = []; + example = literalExample "[ pkgs.gnome3.gpaste ]"; + description = "Additional list of packages to be added to the session search path. + Useful for gnome shell extensions or gsettings-conditionated autostart."; + apply = list: list ++ [ gnome3.gnome_shell gnome3.gnome-shell-extensions ]; + }; + + extraGSettingsOverrides = mkOption { + default = ""; + type = types.lines; + description = "Additional gsettings overrides."; + }; + + extraGSettingsOverridePackages = mkOption { + default = []; + type = types.listOf types.path; + description = "List of packages for which gsettings are overridden."; + }; + }; environment.gnome3.packageSet = mkOption { type = types.nullOr types.package; @@ -130,7 +149,7 @@ in { export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${mimeAppsList}/share # Override gsettings-desktop-schema - export XDG_DATA_DIRS=${nixos-gsettings-desktop-schemas}/share/nixos-gsettings-schemas/nixos-gsettings-desktop-schemas''${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS + export XDG_DATA_DIRS=${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides''${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS # Let nautilus find extensions export NAUTILUS_EXTENSION_DIR=${config.system.path}/lib/nautilus/extensions-3.0/ diff --git a/nixos/release.nix b/nixos/release.nix index d9f3e46b27c0..76ca15ef97fb 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -113,7 +113,7 @@ in rec { }); iso_graphical = forAllSystems (system: makeIso { - module = ./modules/installer/cd-dvd/installation-cd-graphical.nix; + module = ./modules/installer/cd-dvd/installation-cd-graphical-kde.nix; type = "graphical"; inherit system; }); diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-shell/default.nix index 899efc5443bb..11d78cd61328 100644 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-shell/default.nix @@ -37,7 +37,8 @@ stdenv.mkDerivation rec { --prefix PATH : "${unzip}/bin" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --suffix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS" \ + --suffix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" wrapProgram "$out/libexec/gnome-shell-calendar-server" \ --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" diff --git a/pkgs/desktops/gnome-3/3.18/core/nautilus/default.nix b/pkgs/desktops/gnome-3/3.18/core/nautilus/default.nix index f28e86d7bad0..ff9f847d3cdd 100644 --- a/pkgs/desktops/gnome-3/3.18/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/nautilus/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/nautilus" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share" \ + --suffix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; patches = [ ./extension_dir.patch ]; diff --git a/pkgs/desktops/gnome-3/3.18/default.nix b/pkgs/desktops/gnome-3/3.18/default.nix index f949eb1b2085..8234d21f39e9 100644 --- a/pkgs/desktops/gnome-3/3.18/default.nix +++ b/pkgs/desktops/gnome-3/3.18/default.nix @@ -65,6 +65,9 @@ let # Simplify the nixos module and gnome packages defaultIconTheme = adwaita-icon-theme; +# ISO installer + installerIso = callPackage ./installer.nix {}; + #### Core (http://ftp.acc.umu.se/pub/GNOME/core/) adwaita-icon-theme = callPackage ./core/adwaita-icon-theme { }; diff --git a/pkgs/desktops/gnome-3/3.18/installer.nix b/pkgs/desktops/gnome-3/3.18/installer.nix new file mode 100644 index 000000000000..e4d64ac9e885 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.18/installer.nix @@ -0,0 +1,15 @@ +{ isoBaseName ? "nixos-graphical-gnome", system ? builtins.currentSystem +, extraModules ? [] }: + +let + + module = ../../../../nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix; + + config = (import ../../../../nixos/lib/eval-config.nix { + inherit system; + modules = [ module { isoImage.isoBaseName = isoBaseName; } ] ++ extraModules; + }).config; + +in + config.system.build.isoImage + -- cgit 1.4.1 From b2889efff29ea316e66083e590ba22327b851e33 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Tue, 1 Mar 2016 12:50:23 +0100 Subject: devhelp: fix build with new webkitgtk --- pkgs/desktops/gnome-3/3.18/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'pkgs/desktops/gnome-3') diff --git a/pkgs/desktops/gnome-3/3.18/default.nix b/pkgs/desktops/gnome-3/3.18/default.nix index 8234d21f39e9..11e2c7e9bebc 100644 --- a/pkgs/desktops/gnome-3/3.18/default.nix +++ b/pkgs/desktops/gnome-3/3.18/default.nix @@ -312,9 +312,7 @@ let anjuta = callPackage ./devtools/anjuta { }; - devhelp = callPackage ./devtools/devhelp { - webkitgtk = webkitgtk24x; - }; + devhelp = callPackage ./devtools/devhelp { }; gdl = callPackage ./devtools/gdl { }; -- cgit 1.4.1 From 02891a0de97d965be5b792c60d8287794d3c2e5f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 1 Mar 2016 22:03:37 +0100 Subject: gnome: Drop installerIso from nix-env evaluation This makes nix-env -qa depend on NixOS, which is not a good thing. @lethalman --- pkgs/desktops/gnome-3/3.18/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/desktops/gnome-3') diff --git a/pkgs/desktops/gnome-3/3.18/default.nix b/pkgs/desktops/gnome-3/3.18/default.nix index 11e2c7e9bebc..de8b6a5e0dc6 100644 --- a/pkgs/desktops/gnome-3/3.18/default.nix +++ b/pkgs/desktops/gnome-3/3.18/default.nix @@ -66,7 +66,7 @@ let defaultIconTheme = adwaita-icon-theme; # ISO installer - installerIso = callPackage ./installer.nix {}; +# installerIso = callPackage ./installer.nix {}; #### Core (http://ftp.acc.umu.se/pub/GNOME/core/) -- cgit 1.4.1