summary refs log tree commit diff
path: root/pkgs/tools/networking/cjdns
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2015-12-05 13:59:05 +0100
committerVladimír Čunát <vcunat@gmail.com>2015-12-05 13:59:05 +0100
commite2f5ba1937ff14a76360ce06480d752b8ea0bc11 (patch)
treef938ff56ef4b7e2c08db9167403dcf0afac17bc6 /pkgs/tools/networking/cjdns
parent9054ddefeb988f28637749a834d884dac2d2f62a (diff)
downloadnixpkgs-e2f5ba1937ff14a76360ce06480d752b8ea0bc11.tar
nixpkgs-e2f5ba1937ff14a76360ce06480d752b8ea0bc11.tar.gz
nixpkgs-e2f5ba1937ff14a76360ce06480d752b8ea0bc11.tar.bz2
nixpkgs-e2f5ba1937ff14a76360ce06480d752b8ea0bc11.tar.lz
nixpkgs-e2f5ba1937ff14a76360ce06480d752b8ea0bc11.tar.xz
nixpkgs-e2f5ba1937ff14a76360ce06480d752b8ea0bc11.tar.zst
nixpkgs-e2f5ba1937ff14a76360ce06480d752b8ea0bc11.zip
treewide: fix invocations of installBin command
I've removed the trivial command in 4e72b61de.
I think `install -Dt "$out/bin"` is a better replacement anyway,
as it can be easily used to other directories than $out/bin.

/cc @ehmry who seems to maintain many packages with this usage.
(BTW, it would be better to have maintainer attribute same as github
username, as it makes pinging maintainers much easier.)
Diffstat (limited to 'pkgs/tools/networking/cjdns')
-rw-r--r--pkgs/tools/networking/cjdns/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix
index 86c3ea4f919..45155cf306f 100644
--- a/pkgs/tools/networking/cjdns/default.nix
+++ b/pkgs/tools/networking/cjdns/default.nix
@@ -16,13 +16,13 @@ stdenv.mkDerivation {
 
   buildInputs = [ which python27 nodejs ] ++
     # for flock
-    stdenv.lib.optional stdenv.isLinux [ utillinux ];
+    stdenv.lib.optional stdenv.isLinux utillinux;
 
   buildPhase =
     stdenv.lib.optionalString stdenv.isArm "Seccomp_NO=1 "
     + "bash do";
   installPhase = ''
-    installBin cjdroute makekeys privatetopublic publictoip6
+    install -Dt "$out/bin/" cjdroute makekeys privatetopublic publictoip6
     sed -i 's,/usr/bin/env node,'$(type -P node), \
       $(find contrib -name "*.js")
     sed -i 's,/usr/bin/env python,'$(type -P python), \