parent
ed908d81f1
commit
118a6ad716
@ -1,13 +0,0 @@ |
||||
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')
|
@ -1,38 +1,31 @@ |
||||
{ lib, stdenv, fetchFromGitHub, scons, pkg-config, libX11 }: |
||||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libX11 }: |
||||
|
||||
stdenv.mkDerivation rec { |
||||
pname = "xsettingsd"; |
||||
version = "1.0.0"; |
||||
version = "1.0.2"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "derat"; |
||||
repo = "xsettingsd"; |
||||
rev = "v${version}"; |
||||
sha256 = "05m4jlw0mgwp24cvyklncpziq1prr2lg0cq9c055sh4n9d93d07v"; |
||||
sha256 = "sha256-CIYshZqJICuL8adKHIN4R6nudaqWOCK2UPrGhsKf9pE="; |
||||
}; |
||||
|
||||
patches = [ |
||||
./SConstruct.patch |
||||
]; |
||||
|
||||
nativeBuildInputs = [ scons pkg-config ]; |
||||
nativeBuildInputs = [ cmake pkg-config ]; |
||||
|
||||
buildInputs = [ libX11 ]; |
||||
|
||||
buildPhase = '' |
||||
scons -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES |
||||
''; |
||||
|
||||
installPhase = '' |
||||
install -D -t "$out"/bin xsettingsd dump_xsettings |
||||
install -D -t "$out"/usr/share/man/man1 xsettingsd.1 dump_xsettings.1 |
||||
# we end up with symlinked unit files if we don't move them around ourselves |
||||
postFixup = '' |
||||
rm -r $out/lib/systemd |
||||
mv $out/share/systemd $out/lib |
||||
''; |
||||
|
||||
meta = with lib; { |
||||
description = "Provides settings to X11 applications via the XSETTINGS specification"; |
||||
homepage = "https://github.com/derat/xsettingsd"; |
||||
license = licenses.bsd3; |
||||
maintainers = with maintainers; [ romildo ]; |
||||
platforms = platforms.linux; |
||||
maintainers = [ maintainers.romildo ]; |
||||
}; |
||||
} |
||||
|
Loading…
Reference in new issue