From 68102e793df3bcbc6301444be78842bca509d474 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 9 Sep 2018 09:50:22 -0300 Subject: [PATCH] xsettingsd: git-2015-06-14 -> 1.0.0 - Update to version 1.0.0 - Install man pages - Fix license - Add maintainer --- pkgs/tools/X11/xsettingsd/default.nix | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/X11/xsettingsd/default.nix b/pkgs/tools/X11/xsettingsd/default.nix index 239b01e1345..2f84711e61c 100644 --- a/pkgs/tools/X11/xsettingsd/default.nix +++ b/pkgs/tools/X11/xsettingsd/default.nix @@ -1,39 +1,38 @@ -{ stdenv, fetchFromGitHub, scons, libX11, pkgconfig }: +{ stdenv, fetchFromGitHub, scons, pkgconfig, libX11 }: stdenv.mkDerivation rec { name = "xsettingsd-${version}"; - version = "git-2015-06-14"; + version = "1.0.0"; src = fetchFromGitHub { owner = "derat"; repo = "xsettingsd"; - rev = "b4999f5e9e99224caf97d09f25ee731774ecd7be"; - sha256 = "18cp6a66ji483lrvf0vq855idwmcxd0s67ijpydgjlsr70c65j7s"; + rev = "v${version}"; + sha256 = "05m4jlw0mgwp24cvyklncpziq1prr2lg0cq9c055sh4n9d93d07v"; }; patches = [ ./SConstruct.patch ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 scons ]; + nativeBuildInputs = [ scons pkgconfig ]; + + buildInputs = [ libX11 ]; + buildPhase = '' - mkdir -p "$out" - scons \ - -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \ - "prefix=$out" + scons -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES ''; installPhase = '' - mkdir -p "$out"/bin - install xsettingsd "$out"/bin - install dump_xsettings "$out"/bin + install -D -t "$out"/bin xsettingsd dump_xsettings + install -D -t "$out"/usr/share/man/man1 xsettingsd.1 dump_xsettings.1 ''; meta = with stdenv.lib; { description = "Provides settings to X11 applications via the XSETTINGS specification"; homepage = https://github.com/derat/xsettingsd; - license = licenses.bsd2; + license = licenses.bsd3; platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; }; }