From 92a831a4ecfdc58106564ff7f69f13a7dd29a079 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 16 Apr 2014 15:01:11 +0200
Subject: [PATCH] xdg-user-dirs: new package
A tool to help manage well known user directories
like the desktop folder and the music folder
http://freedesktop.org/wiki/Software/xdg-user-dirs
---
.../services/x11/desktop-managers/gnome3.nix | 3 +++
pkgs/tools/X11/xdg-user-dirs/default.nix | 20 +++++++++++++++++++
pkgs/top-level/all-packages.nix | 2 ++
3 files changed, 25 insertions(+)
create mode 100644 pkgs/tools/X11/xdg-user-dirs/default.nix
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index d2f671f43771..5c602e6eb83b 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -67,6 +67,9 @@ in {
# Don't let epiphany depend upon gnome-shell
export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${pkgs.gnome3.gnome_shell}/share/gsettings-schemas/${pkgs.gnome3.gnome_shell.name}
+ # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/
+ ${pkgs.xdg-user-dirs}/bin/xdg-user-dirs-update
+
${gnome3.gnome_session}/bin/gnome-session&
waitPID=$!
'';
diff --git a/pkgs/tools/X11/xdg-user-dirs/default.nix b/pkgs/tools/X11/xdg-user-dirs/default.nix
new file mode 100644
index 000000000000..bb26c0f46ceb
--- /dev/null
+++ b/pkgs/tools/X11/xdg-user-dirs/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, libxslt, docbook_xsl }:
+
+stdenv.mkDerivation rec {
+ name = "xdg-user-dirs-0.15";
+
+ src = fetchurl {
+ url = "http://user-dirs.freedesktop.org/releases/${name}.tar.gz";
+ sha256 = "20b4a751f41d0554bce3e0ce5e8d934be98cc62d48f0b90a894c3e1916552786";
+ };
+
+ buildInputs = [ libxslt docbook_xsl ];
+
+ meta = with stdenv.lib; {
+ homepage = http://freedesktop.org/wiki/Software/xdg-user-dirs;
+ description = "A tool to help manage well known user directories like the desktop folder and the music folder";
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ lethalman ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3ca1041fa091..1f0b34750fef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9455,6 +9455,8 @@ let
xdaliclock = callPackage ../tools/misc/xdaliclock {};
+ xdg-user-dirs = callPackage ../tools/X11/xdg-user-dirs { };
+
xdg_utils = callPackage ../tools/X11/xdg-utils { };
xdotool = callPackage ../tools/X11/xdotool { };