diff options
| author | Luca Bruno <lucabru@src.gnome.org> | 2015-10-08 14:53:37 +0200 |
|---|---|---|
| committer | Luca Bruno <lethalman88@gmail.com> | 2016-02-29 15:51:38 +0100 |
| commit | aa9576bceb56d4fe2fb24e6fb47001817baeab34 (patch) | |
| tree | 62d255bc2be56428c3a4d3145c10a0cfa9923227 /pkgs/desktops | |
| parent | 40c586b7ce2c559374df435f46d673baf711c543 (diff) | |
| download | nixlib-aa9576bceb56d4fe2fb24e6fb47001817baeab34.tar nixlib-aa9576bceb56d4fe2fb24e6fb47001817baeab34.tar.gz nixlib-aa9576bceb56d4fe2fb24e6fb47001817baeab34.tar.bz2 nixlib-aa9576bceb56d4fe2fb24e6fb47001817baeab34.tar.lz nixlib-aa9576bceb56d4fe2fb24e6fb47001817baeab34.tar.xz nixlib-aa9576bceb56d4fe2fb24e6fb47001817baeab34.tar.zst nixlib-aa9576bceb56d4fe2fb24e6fb47001817baeab34.zip | |
installer: add graphical GNOME iso
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome-3/3.18/core/gnome-shell/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/3.18/core/nautilus/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/3.18/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/3.18/installer.nix | 15 |
4 files changed, 22 insertions, 2 deletions
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 + |