From fe24bde02f8a09fb31362e64c373469ff9af7e8d Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 9 Apr 2024 22:47:07 +0200 Subject: [PATCH] etlegacy: fix binaries wrappers --- pkgs/by-name/et/etlegacy-unwrapped/package.nix | 5 ----- pkgs/by-name/et/etlegacy/package.nix | 6 ++++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/et/etlegacy-unwrapped/package.nix b/pkgs/by-name/et/etlegacy-unwrapped/package.nix index 8bacd93e1a2b..84526ae11ada 100644 --- a/pkgs/by-name/et/etlegacy-unwrapped/package.nix +++ b/pkgs/by-name/et/etlegacy-unwrapped/package.nix @@ -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 = { diff --git a/pkgs/by-name/et/etlegacy/package.nix b/pkgs/by-name/et/etlegacy/package.nix index e98b63c7a352..446659c0148f 100644 --- a/pkgs/by-name/et/etlegacy/package.nix +++ b/pkgs/by-name/et/etlegacy/package.nix @@ -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 = {