summary refs log tree commit diff
path: root/pkgs/applications/window-managers
diff options
context:
space:
mode:
authorJörg Thalheim <joerg@thalheim.io>2021-07-10 10:24:32 +0200
committerJörg Thalheim <joerg@thalheim.io>2021-07-10 10:25:02 +0200
commit634e6bb36a8c3bf3b9a742f29159651416a1cdc1 (patch)
tree49accc58c00e32191b399ada880dde9b91a52142 /pkgs/applications/window-managers
parentfaec8bbbf78f3a1e3439c321c2270b2f9209bff1 (diff)
downloadnixpkgs-634e6bb36a8c3bf3b9a742f29159651416a1cdc1.tar
nixpkgs-634e6bb36a8c3bf3b9a742f29159651416a1cdc1.tar.gz
nixpkgs-634e6bb36a8c3bf3b9a742f29159651416a1cdc1.tar.bz2
nixpkgs-634e6bb36a8c3bf3b9a742f29159651416a1cdc1.tar.lz
nixpkgs-634e6bb36a8c3bf3b9a742f29159651416a1cdc1.tar.xz
nixpkgs-634e6bb36a8c3bf3b9a742f29159651416a1cdc1.tar.zst
nixpkgs-634e6bb36a8c3bf3b9a742f29159651416a1cdc1.zip
leftwm: set rpath in all executables
Diffstat (limited to 'pkgs/applications/window-managers')
-rw-r--r--pkgs/applications/window-managers/leftwm/default.nix15
1 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/applications/window-managers/leftwm/default.nix
index ca1a98dcdc3..e8330ee2936 100644
--- a/pkgs/applications/window-managers/leftwm/default.nix
+++ b/pkgs/applications/window-managers/leftwm/default.nix
@@ -1,7 +1,7 @@
-{ lib, fetchFromGitHub, rustPlatform, libX11, libXinerama, makeWrapper }:
+{ lib, fetchFromGitHub, rustPlatform, libX11, libXinerama }:
 
 let
-    rpath = lib.makeLibraryPath [ libXinerama libX11 ];
+  rpathLibs = [ libXinerama libX11 ];
 in
 
 rustPlatform.buildRustPackage rec {
@@ -17,15 +17,16 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "sha256-2prRtdBxpYc2xI/bLZNlqs3mxESfO9GhNUSlKFF//eE=";
 
-  nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ libX11 libXinerama ];
+  buildInputs = rpathLibs;
 
   postInstall = ''
-    wrapProgram $out/bin/leftwm --prefix LD_LIBRARY_PATH : "${rpath}"
-    wrapProgram $out/bin/leftwm-state --prefix LD_LIBRARY_PATH : "${rpath}"
-    wrapProgram $out/bin/leftwm-worker --prefix LD_LIBRARY_PATH : "${rpath}"
+    for p in $out/bin/leftwm*; do
+      patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}" $p
+    done
   '';
 
+  dontPatchELF = true;
+
   meta = with lib; {
     description = "A tiling window manager for the adventurer";
     homepage = "https://github.com/leftwm/leftwm";