diff options
| -rw-r--r-- | pkgs/tools/misc/unclutter-xfixes/default.nix | 38 |
1 files changed, 8 insertions, 30 deletions
diff --git a/pkgs/tools/misc/unclutter-xfixes/default.nix b/pkgs/tools/misc/unclutter-xfixes/default.nix index 9f43a7bd699..5e1661a6a29 100644 --- a/pkgs/tools/misc/unclutter-xfixes/default.nix +++ b/pkgs/tools/misc/unclutter-xfixes/default.nix @@ -2,45 +2,23 @@ xlibsWrapper, libev, libXi, libXfixes, pkgconfig, asciidoc, libxslt, docbook_xsl }: -let version = "1.3"; in +stdenv.mkDerivation rec { + pname = "unclutter-xfixes"; + version = "1.4"; -stdenv.mkDerivation { - name = "unclutter-xfixes-${version}"; - version = version; - src = fetchFromGitHub { owner = "Airblader"; repo = "unclutter-xfixes"; rev = "v${version}"; - sha256 = "1iikrz0023wygv29ny20xj1hlv9ry7hghlwjii6rj4jm59vl0mlz"; + sha256 = "0anny6hvwf5nh7ghgi4gdcywhwyhgfvqvp7fjhm59kjc3qxnwf96"; }; - nativeBuildInputs = [pkgconfig]; - buildInputs = [ - xlibsWrapper libev libXi libXfixes - asciidoc libxslt docbook_xsl - ]; + nativeBuildInputs = [ pkgconfig asciidoc libxslt docbook_xsl ]; + buildInputs = [ xlibsWrapper libev libXi libXfixes ]; - postPatch = '' - substituteInPlace Makefile --replace "CC = gcc" "CC = cc" - ''; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; - preBuild = '' - # The Makefile calls git only to discover the package version, - # but that doesn't work right in the build environment, - # so we fake it. - git() { echo v${version}; } - export -f git - ''; - - preInstall = '' - export DESTDIR=$out MANDIR=/man/man1 - ''; - - postInstall = '' - mv $out/usr/bin $out/bin - mv $out/usr/share/man $out/man - ''; + installFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { description = "Rewrite of unclutter using the X11 Xfixes extension"; |