diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2020-04-27 22:35:31 -0400 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2020-04-29 13:23:35 -0400 |
| commit | 62587f43ddf884335f2ed0ee83673d9ffa9a2465 (patch) | |
| tree | 83c9424c301557f6636a1e12555fa9623e8de0d3 /pkgs/desktops/pantheon/desktop | |
| parent | 6a627c416fe663ac16064f7a155afba9522910e4 (diff) | |
| download | nixpkgs-62587f43ddf884335f2ed0ee83673d9ffa9a2465.tar nixpkgs-62587f43ddf884335f2ed0ee83673d9ffa9a2465.tar.gz nixpkgs-62587f43ddf884335f2ed0ee83673d9ffa9a2465.tar.bz2 nixpkgs-62587f43ddf884335f2ed0ee83673d9ffa9a2465.tar.lz nixpkgs-62587f43ddf884335f2ed0ee83673d9ffa9a2465.tar.xz nixpkgs-62587f43ddf884335f2ed0ee83673d9ffa9a2465.tar.zst nixpkgs-62587f43ddf884335f2ed0ee83673d9ffa9a2465.zip | |
nixos-artwork: add file path attributes
This makes things so much easier, and we install to the path that both gnome-backgrounds and elementary-wallpapers install to.
Diffstat (limited to 'pkgs/desktops/pantheon/desktop')
| -rw-r--r-- | pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix index 4e8d8bfeb15..3215c001a5e 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "--sysconfdir=${placeholder "out"}/etc" - "-Ddefault-wallpaper=${nixos-artwork.wallpapers.simple-dark-gray}/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png" + "-Ddefault-wallpaper=${nixos-artwork.wallpapers.simple-dark-gray.gnomeFilePath}" "-Dplank-dockitems=false" ]; diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index 64c4509280a..c460d45dfee 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { # Needed until https://github.com/elementary/greeter/issues/360 is fixed (substituteAll { src = ./hardcode-fallback-background.patch; - default_wallpaper = "${nixos-artwork.wallpapers.simple-dark-gray}/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png"; + default_wallpaper = "${nixos-artwork.wallpapers.simple-dark-gray.gnomeFilePath}"; }) ]; @@ -113,7 +113,7 @@ stdenv.mkDerivation rec { # Use NixOS default wallpaper substituteInPlace $out/etc/lightdm/io.elementary.greeter.conf \ --replace "#default-wallpaper=/usr/share/backgrounds/elementaryos-default" \ - "default-wallpaper=${nixos-artwork.wallpapers.simple-dark-gray}/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png" + "default-wallpaper=${nixos-artwork.wallpapers.simple-dark-gray.gnomeFilePath}" substituteInPlace $out/share/xgreeters/io.elementary.greeter.desktop \ --replace "Exec=io.elementary.greeter" "Exec=$out/bin/io.elementary.greeter" |