Merge pull request #302929 from drupol/etlegacy-fix-desktop-files-part-II

etlegacy: fix binaries wrappers
This commit is contained in:
Pol Dellaiera 2024-04-10 07:27:09 +02:00 committed by GitHub
commit 78216458e8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 7 deletions

View File

@ -92,11 +92,6 @@ stdenv.mkDerivation {
"-DINSTALL_DEFAULT_BINDIR=${placeholder "out"}/bin"
];
postInstall = ''
makeWrapper $out/bin/etl.* $out/bin/etl
makeWrapper $out/bin/etlded.* $out/bin/etlded
'';
hardeningDisable = [ "fortify" ];
meta = {

View File

@ -18,10 +18,12 @@ symlinkJoin {
];
postBuild = ''
makeWrapper $out/bin/etl.* $out/bin/etl \
wrapProgram $out/bin/etl.* \
--add-flags "+set fs_basepath ${placeholder "out"}/lib/etlegacy"
makeWrapper $out/bin/etlded.* $out/bin/etlded \
wrapProgram $out/bin/etlded.* \
--add-flags "+set fs_basepath ${placeholder "out"}/lib/etlegacy"
makeWrapper $out/bin/etl.* $out/bin/etl
makeWrapper $out/bin/etlded.* $out/bin/etlded
'';
meta = {