diff options
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/misc/x11idle/default.nix | 17 | ||||
-rw-r--r-- | pkgs/tools/package-management/home-manager/default.nix | 5 |
2 files changed, 13 insertions, 9 deletions
diff --git a/pkgs/tools/misc/x11idle/default.nix b/pkgs/tools/misc/x11idle/default.nix index 270b39f8110b..ac13f41ef9f5 100644 --- a/pkgs/tools/misc/x11idle/default.nix +++ b/pkgs/tools/misc/x11idle/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchgit, libXScrnSaver, libX11 }: +{ stdenv, fetchurl, libXScrnSaver, libX11 }: -stdenv.mkDerivation { - name = "x11idle-unstable-2017-07-01"; +stdenv.mkDerivation rec { - src = fetchgit { - url = "git://orgmode.org/org-mode.git"; - rev = "fbd865941f3105f689f78bf053bb3b353b9b8a23"; - sha256 = "0ma3m48f4s38xln0gl1ww9i5x28ij0ipxc94kx5h2931zy7lqzvz"; + version = "9.2.4"; + name = "x11idle-org-${version}"; + + src = fetchurl { + url = "https://code.orgmode.org/bzg/org-mode/raw/release_${version}/contrib/scripts/x11idle.c"; + sha256 = "0fc5g57xd6bmghyl214gcff0ni3idv33i3gkr339kgn1mdjljv5g"; }; buildInputs = [ libXScrnSaver libX11 ]; @@ -15,7 +16,7 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out/bin - gcc -lXss -lX11 $src/contrib/scripts/x11idle.c -o $out/bin/x11idle + gcc -lXss -lX11 $src -o $out/bin/x11idle ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/tools/package-management/home-manager/default.nix index 3fb14f99faf6..793c7cfae32d 100644 --- a/pkgs/tools/package-management/home-manager/default.nix +++ b/pkgs/tools/package-management/home-manager/default.nix @@ -28,12 +28,15 @@ stdenv.mkDerivation rec { --subst-var-by gnused "${gnused}" \ --subst-var-by less "${less}" \ --subst-var-by HOME_MANAGER_PATH '${src}' + + install -D -m755 home-manager/completion.bash \ + "$out/share/bash-completion/completions/home-manager" ''; meta = with stdenv.lib; { description = "A user environment configurator"; maintainers = with maintainers; [ rycee ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.mit; }; |