nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 16:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

treewide: update the usage of makeWrapper after #31497

Browse Source
This commit is contained in:
Orivej Desh 2017-11-19 23:50:49 +00:00
parent 7faaade23e
commit fb703ad117
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/instant-messengers/hipchat/default.nix
View File

@ -78,8 +78,8 @@ stdenv.mkDerivation {
--replace /opt/HipChat4/bin/HipChat4 $out/bin/hipchat --replace /opt/HipChat4/bin/HipChat4 $out/bin/hipchat
makeWrapper $d/HipChat.bin $out/bin/hipchat \ makeWrapper $d/HipChat.bin $out/bin/hipchat \
--set HIPCHAT_LD_LIBRARY_PATH '"$LD_LIBRARY_PATH"' \ --run 'export HIPCHAT_LD_LIBRARY_PATH=$LD_LIBRARY_PATH' \
--set HIPCHAT_QT_PLUGIN_PATH '"$QT_PLUGIN_PATH"' \ --run 'export HIPCHAT_QT_PLUGIN_PATH=$QT_PLUGIN_PATH' \
--set QT_XKB_CONFIG_ROOT ${xkeyboard_config}/share/X11/xkb \ --set QT_XKB_CONFIG_ROOT ${xkeyboard_config}/share/X11/xkb \
--set QTWEBENGINEPROCESS_PATH $d/QtWebEngineProcess --set QTWEBENGINEPROCESS_PATH $d/QtWebEngineProcess

6
pkgs/applications/window-managers/qtile/default.nix
View File

@ -36,9 +36,9 @@ python27Packages.buildPythonApplication rec {
postInstall = '' postInstall = ''
wrapProgram $out/bin/qtile \ wrapProgram $out/bin/qtile \
--set QTILE_WRAPPER '$0' \ --run "export QTILE_WRAPPER=$0" \
--set QTILE_SAVED_PYTHONPATH '$PYTHONPATH' \ --run "export QTILE_SAVED_PYTHONPATH=$PYTHONPATH" \
--set QTILE_SAVED_PATH '$PATH' --run "export QTILE_SAVED_PATH=$PATH"
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

2
pkgs/development/compilers/chicken/eggDerivation.nix
View File

@ -37,7 +37,7 @@ stdenv.mkDerivation ({
wrapProgram $f \ wrapProgram $f \
--set CHICKEN_REPOSITORY $CHICKEN_REPOSITORY \ --set CHICKEN_REPOSITORY $CHICKEN_REPOSITORY \
--prefix CHICKEN_REPOSITORY_EXTRA : "$out/lib/chicken/${toString chicken.binaryVersion}/:$CHICKEN_REPOSITORY_EXTRA" \ --prefix CHICKEN_REPOSITORY_EXTRA : "$out/lib/chicken/${toString chicken.binaryVersion}/:$CHICKEN_REPOSITORY_EXTRA" \
--prefix CHICKEN_INCLUDE_PATH \; \"$CHICKEN_INCLUDE_PATH\;$out/share/\" \ --prefix CHICKEN_INCLUDE_PATH \; "$CHICKEN_INCLUDE_PATH;$out/share/" \
--prefix PATH : "$out/bin:${chicken}/bin:$CHICKEN_REPOSITORY_EXTRA:$CHICKEN_REPOSITORY" --prefix PATH : "$out/bin:${chicken}/bin:$CHICKEN_REPOSITORY_EXTRA:$CHICKEN_REPOSITORY"
done done

2
pkgs/development/tools/build-managers/redo-sh/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
mv man "$out/share" mv man "$out/share"
mv bin "$out" mv bin "$out"
for p in $out/bin/*; do for p in $out/bin/*; do
wrapProgram "$p" --set PATH '$PATH:'"$out/bin" wrapProgram "$p" --suffix PATH : "$out/bin"
done done
''; '';

2
pkgs/games/mudlet/default.nix
View File

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
cp -r mudlet-lua $out cp -r mudlet-lua $out
makeWrapper $out/mudlet $out/bin/mudlet \ makeWrapper $out/mudlet $out/bin/mudlet \
--set LUA_CPATH "\"${luaFileSystemPath};${luaZipPath};${lrexlibPath};${luasqlitePath}\"" \ --set LUA_CPATH "${luaFileSystemPath};${luaZipPath};${lrexlibPath};${luasqlitePath}" \
--run "cd $out"; --run "cd $out";
''; '';

2
pkgs/servers/sql/oracle-xe/default.nix
View File

@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
makeWrapper "$i" "$out/bin/''${i##*/}" \ makeWrapper "$i" "$out/bin/''${i##*/}" \
--set ORACLE_HOME "$out/libexec/oracle" \ --set ORACLE_HOME "$out/libexec/oracle" \
--set ORACLE_SID XE \ --set ORACLE_SID XE \
--set NLS_LANG '$("'"$out"'/libexec/oracle/bin/nls_lang.sh")' \ --run "export NLS_LANG=\$($out/libexec/oracle/bin/nls_lang.sh)" \
--prefix PATH : "$out/libexec/oracle/bin" --prefix PATH : "$out/libexec/oracle/bin"
done done
''; '';