diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-12-05 13:59:05 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-12-05 13:59:05 +0100 |
commit | e2f5ba1937ff14a76360ce06480d752b8ea0bc11 (patch) | |
tree | f938ff56ef4b7e2c08db9167403dcf0afac17bc6 | |
parent | 9054ddefeb988f28637749a834d884dac2d2f62a (diff) | |
download | nixpkgs-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.)
-rw-r--r-- | pkgs/applications/misc/monero/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/nim/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/archivers/unrar/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/networking/cjdns/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/zerotierone/default.nix | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/misc/monero/default.nix b/pkgs/applications/misc/monero/default.nix index 6af9b7dc267..65483c80823 100644 --- a/pkgs/applications/misc/monero/default.nix +++ b/pkgs/applications/misc/monero/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { checkTarget = "test-release"; # this would be the target installPhase = '' - installBin \ + install -Dt "$out/bin/" \ src/bitmonerod \ src/connectivity_tool \ src/simpleminer \ diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 142167e3373..20f7a87c254 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildPhase = "sh build.sh"; installPhase = '' - installBin bin/nim + install -Dt "$out/bin" bin/nim substituteInPlace install.sh --replace '$1/nim' "$out" sh install.sh $out ''; diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index eb0d3a3bd83..e0716a1b1d3 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { ''; installPhase = '' - installBin unrar + install -Dt "$out/bin" unrar mkdir -p $out/share/doc/unrar cp acknow.txt license.txt \ 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), \ diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index d9a50d7dc69..63531a85ffc 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl lzo zlib gcc iproute ]; installPhase = '' - installBin zerotier-one + install -Dt "$out/bin/" zerotier-one ln -s $out/bin/zerotier-one $out/bin/zerotier-idtool ln -s $out/bin/zerotier-one $out/bin/zerotier-cli ''; |