diff options
| author | Naïm Favier <n@monade.li> | 2022-03-14 19:06:00 +0100 |
|---|---|---|
| committer | Naïm Favier <n@monade.li> | 2022-03-19 09:46:31 +0100 |
| commit | 9160044f5f05d0a4ac46f1260beb8604c15ed4fa (patch) | |
| tree | baed08f4b9da8509af8f1e126c054d13a0d69ef8 /pkgs/os-specific/linux | |
| parent | 10479e4f51ff182651ccff4a71b2a94ab93816c0 (diff) | |
| download | nixpkgs-9160044f5f05d0a4ac46f1260beb8604c15ed4fa.tar nixpkgs-9160044f5f05d0a4ac46f1260beb8604c15ed4fa.tar.gz nixpkgs-9160044f5f05d0a4ac46f1260beb8604c15ed4fa.tar.bz2 nixpkgs-9160044f5f05d0a4ac46f1260beb8604c15ed4fa.tar.lz nixpkgs-9160044f5f05d0a4ac46f1260beb8604c15ed4fa.tar.xz nixpkgs-9160044f5f05d0a4ac46f1260beb8604c15ed4fa.tar.zst nixpkgs-9160044f5f05d0a4ac46f1260beb8604c15ed4fa.zip | |
treewide/makeWrapper: replace `--run cd` with `--chdir`
Lay the groundwork for switching to binary wrappers by reducing uses of `--run` (which is not supported by `makeBinaryWrapper`).
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/displaylink/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/sgx/psw/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/sgx/samples/default.nix | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix index f1e942a4399..99e04c0fa6e 100644 --- a/pkgs/os-specific/linux/displaylink/default.nix +++ b/pkgs/os-specific/linux/displaylink/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { --set-rpath ${libPath} \ $out/bin/DisplayLinkManager wrapProgram $out/bin/DisplayLinkManager \ - --run "cd $out/lib/displaylink" + --chdir "$out/lib/displaylink" # We introduce a dependency on the source file so that it need not be redownloaded everytime echo $src >> "$out/share/workspace_dependencies.pin" diff --git a/pkgs/os-specific/linux/sgx/psw/default.nix b/pkgs/os-specific/linux/sgx/psw/default.nix index b418d5c1822..f6564f1560c 100644 --- a/pkgs/os-specific/linux/sgx/psw/default.nix +++ b/pkgs/os-specific/linux/sgx/psw/default.nix @@ -135,7 +135,7 @@ stdenv.mkDerivation rec { mkdir $out/bin makeWrapper $out/aesm/aesm_service $out/bin/aesm_service \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ protobuf ]}:$out/aesm \ - --run "cd $out/aesm" + --chdir "$out/aesm" # Make sure we didn't forget to handle any files rmdir $sgxPswDir || (echo "Error: The directory $installDir still contains unhandled files: $(ls -A $installDir)" >&2 && exit 1) diff --git a/pkgs/os-specific/linux/sgx/samples/default.nix b/pkgs/os-specific/linux/sgx/samples/default.nix index f9c5ae45054..2afd62de75d 100644 --- a/pkgs/os-specific/linux/sgx/samples/default.nix +++ b/pkgs/os-specific/linux/sgx/samples/default.nix @@ -41,7 +41,7 @@ let install *.so $out/lib wrapProgram "$out/bin/app" \ - --run "cd $out/lib" \ + --chdir "$out/lib" \ ${lib.optionalString (!isSimulation) ''--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ sgx-psw ]}"''} @@ -76,7 +76,7 @@ in for bin in $out/bin/*; do wrapProgram $bin \ - --run "cd $out/lib" \ + --chdir "$out/lib" \ ${lib.optionalString (!isSimulation) ''--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ sgx-psw ]}"''} done |