diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2019-02-16 05:00:11 +0100 |
|---|---|---|
| committer | Maximilian Bosch <maximilian@mbosch.me> | 2019-02-16 05:03:10 +0100 |
| commit | 346df14000fa4c839b39b3e0c36f0fb2b16f325a (patch) | |
| tree | 451423642fb7e39bb17ac36b1dd0ae1a2a33750f /pkgs/tools/X11 | |
| parent | 5a00711ef84964d7ff076d24ae6ae684cbfa5b6b (diff) | |
| download | nixpkgs-346df14000fa4c839b39b3e0c36f0fb2b16f325a.tar nixpkgs-346df14000fa4c839b39b3e0c36f0fb2b16f325a.tar.gz nixpkgs-346df14000fa4c839b39b3e0c36f0fb2b16f325a.tar.bz2 nixpkgs-346df14000fa4c839b39b3e0c36f0fb2b16f325a.tar.lz nixpkgs-346df14000fa4c839b39b3e0c36f0fb2b16f325a.tar.xz nixpkgs-346df14000fa4c839b39b3e0c36f0fb2b16f325a.tar.zst nixpkgs-346df14000fa4c839b39b3e0c36f0fb2b16f325a.zip | |
nx-libs: minor fixes
* Add an alias with a deprecation warning for `nxproxy` to avoid an immediate breaking change. * Use the default shell used in the build environment (`stdenv.shell`) for patching. This shell is in the environment and thus used to patch scripts using `patchShebangs`. The shell is referenced as `stdenv.shell` in Makefiles to patch the remaining occurrences of `/bin/bash` in the build environment.
Diffstat (limited to 'pkgs/tools/X11')
| -rw-r--r-- | pkgs/tools/X11/nx-libs/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/X11/nx-libs/default.nix b/pkgs/tools/X11/nx-libs/default.nix index fb84bcf6a58..bd81ab9d8fd 100644 --- a/pkgs/tools/X11/nx-libs/default.nix +++ b/pkgs/tools/X11/nx-libs/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; postPatch = '' - find . -type f -executable -exec sed -i 's|^#!/bin/bash$|#!${bash}/bin/bash|g' {} \; - find . -type f -name Makefile -exec sed -i 's|^\(SHELL:=\)/bin/bash$|\1${bash}/bin/bash|g' {} \; + patchShebangs . + find . -type f -name Makefile -exec sed -i 's|^\(SHELL:=\)/bin/bash$|\1${stdenv.shell}|g' {} \; ln -s libNX_X11.so.6.3.0 ''; |