diff options
author | obadz <obadz-git@obadz.com> | 2016-08-23 18:50:06 +0100 |
---|---|---|
committer | obadz <obadz-git@obadz.com> | 2016-08-23 18:50:06 +0100 |
commit | 0e8d2725dcc1aef5c56e63c939249b27190f6367 (patch) | |
tree | 654e83b5f539b31947ee5011a0d1df797bf4c75d /pkgs/applications/backup/areca/default.nix | |
parent | 13c04c837db0f69705cfa4478c513b2230243ca2 (diff) | |
parent | 415e1983ca650777d476d39de1db61a9e9877621 (diff) | |
download | nixlib-0e8d2725dcc1aef5c56e63c939249b27190f6367.tar nixlib-0e8d2725dcc1aef5c56e63c939249b27190f6367.tar.gz nixlib-0e8d2725dcc1aef5c56e63c939249b27190f6367.tar.bz2 nixlib-0e8d2725dcc1aef5c56e63c939249b27190f6367.tar.lz nixlib-0e8d2725dcc1aef5c56e63c939249b27190f6367.tar.xz nixlib-0e8d2725dcc1aef5c56e63c939249b27190f6367.tar.zst nixlib-0e8d2725dcc1aef5c56e63c939249b27190f6367.zip |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/applications/backup/areca/default.nix')
-rw-r--r-- | pkgs/applications/backup/areca/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/applications/backup/areca/default.nix b/pkgs/applications/backup/areca/default.nix index 90d38712317b..7a7f6f2ac496 100644 --- a/pkgs/applications/backup/areca/default.nix +++ b/pkgs/applications/backup/areca/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { substituteInPlace bin/areca_run.sh --replace "/usr/lib/java/swt.jar" "${swt}/jars/swt.jar" sed -i "s#^PROGRAM_DIR.*#PROGRAM_DIR=$out#g" bin/areca_run.sh - sed -i "s#^LIBRARY_PATH.*#LIBRARY_PATH=${swt}/lib:$out/lib:${acl}/lib#g" bin/areca_run.sh + sed -i "s#^LIBRARY_PATH.*#LIBRARY_PATH=$out/lib:${stdenv.lib.makeLibraryPath [ swt acl ]}#g" bin/areca_run.sh # https://sourceforge.net/p/areca/bugs/563/ substituteInPlace bin/areca_run.sh --replace '[ "$JAVA_IMPL" = "java" ]' \ |