JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xsettingsd: 1.0.0 -> 1.0.2 (#112609)

Browse Source 
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
This commit is contained in:
Peter Hoeg 2021-02-10 21:30:42 +08:00 committed by GitHub
parent ed908d81f1
commit 118a6ad716
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/tools/X11/xsettingsd/SConstruct.patch
View File

@ -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')

25
pkgs/tools/X11/xsettingsd/default.nix
View File

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