Merge pull request #8149 from clefru/xsettingsd

Add xsettingsd package

3 files changed, 52 insertions, 0 deletions

diff --git a/pkgs/tools/X11/xsettingsd/SConstruct.patch b/pkgs/tools/X11/xsettingsd/SConstruct.patch
new file mode 100644
index 000000000000..bae8d1efc14d
--- /dev/null
+++ b/pkgs/tools/X11/xsettingsd/SConstruct.patch
@@ -0,0 +1,13 @@
+diff --git a/SConstruct b/SConstruct
+index bebc82e..3e0127b 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -59,6 +59,8 @@ srcs = Split('''\
+ ''')
+ libxsettingsd = env.Library('xsettingsd', srcs)
+ env['LIBS'] = libxsettingsd
++env['ENV']['PATH'] = os.environ.get('PATH', '')
++env['ENV']['PKG_CONFIG_PATH'] = os.environ.get('PKG_CONFIG_PATH', '')
+ env.ParseConfig('pkg-config --cflags --libs x11')
+ 
+ xsettingsd     = env.Program('xsettingsd', 'xsettingsd.cc')
diff --git a/pkgs/tools/X11/xsettingsd/default.nix b/pkgs/tools/X11/xsettingsd/default.nix
new file mode 100644
index 000000000000..254cc8a4961f
--- /dev/null
+++ b/pkgs/tools/X11/xsettingsd/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub, scons, libX11, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "xsettingsd-${version}";
+  version = "0.0.1";
+
+  src = fetchFromGitHub {
+    owner = "derat";
+    repo = "xsettingsd";
+    rev = "2a516a91d8352b3b93a7a1ef5606dbd21fa06b7c";
+    sha256 = "0f9lc5w18x6xs9kf72jpixprp3xb7wqag23cy8zrm33n2bza9dj0";
+  };
+
+  patches = [
+    ./SConstruct.patch
+  ];
+
+  buildInputs = [ libX11 scons pkgconfig ];
+  buildPhase = ''
+    mkdir -p "$out"
+    scons \
+      -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \
+      "prefix=$out"
+  '';
+  
+  installPhase = ''
+    mkdir -p "$out"/bin
+    install xsettingsd "$out"/bin
+    install dump_xsettings "$out"/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Provides settings to X11 applications via the XSETTINGS specification";
+    homepage = https://github.com/derat/xsettingsd;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f7000758c6a0..dcc861b5d4d8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3223,6 +3223,8 @@ let
 
   xbrightness = callPackage ../tools/X11/xbrightness { };
 
+  xsettingsd = callPackage ../tools/X11/xsettingsd { };
+
   xcruiser = callPackage ../applications/misc/xcruiser { };
 
   unarj = callPackage ../tools/archivers/unarj { };