summary refs log tree commit diff
path: root/pkgs/applications/misc/kitty/default.nix
diff options
context:
space:
mode:
authorLuflosi <luflosi@luflosi.de>2019-12-07 22:49:41 +0100
committerLuflosi <luflosi@luflosi.de>2019-12-07 23:05:47 +0100
commitc562eb22ab41b636186d4bf0f9f3c5194b05197f (patch)
tree9abc07c7e3b224d896232027c830cd464da0dbe2 /pkgs/applications/misc/kitty/default.nix
parentb665c387bca5aad9408e8b54f977f0bfe5e21a42 (diff)
downloadnixpkgs-c562eb22ab41b636186d4bf0f9f3c5194b05197f.tar
nixpkgs-c562eb22ab41b636186d4bf0f9f3c5194b05197f.tar.gz
nixpkgs-c562eb22ab41b636186d4bf0f9f3c5194b05197f.tar.bz2
nixpkgs-c562eb22ab41b636186d4bf0f9f3c5194b05197f.tar.lz
nixpkgs-c562eb22ab41b636186d4bf0f9f3c5194b05197f.tar.xz
nixpkgs-c562eb22ab41b636186d4bf0f9f3c5194b05197f.tar.zst
nixpkgs-c562eb22ab41b636186d4bf0f9f3c5194b05197f.zip
kitty: replace library path using patch instead of substituteInPlace
This makes patching the path for `libEGL` consistent with `libstartup-notification` and `libcanberra`.
It should also prevent silently doing nothing in case the code in kitty is changed, similar to what was described in 1842c4aaa409e4731d355aa1f77ed817dd3939a2.
Diffstat (limited to 'pkgs/applications/misc/kitty/default.nix')
-rw-r--r--pkgs/applications/misc/kitty/default.nix5
1 files changed, 1 insertions, 4 deletions
diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix
index e4281ede89f..dbb4f5138c3 100644
--- a/pkgs/applications/misc/kitty/default.nix
+++ b/pkgs/applications/misc/kitty/default.nix
@@ -70,6 +70,7 @@ buildPythonApplication rec {
       src = ./library-paths.patch;
       libstartup_notification = "${libstartup_notification}/lib/libstartup-notification-1.so";
       libcanberra = "${libcanberra}/lib/libcanberra.so";
+      libEGL = "${stdenv.lib.getLib libGL}/lib/libEGL.so.1";
     })
   ] ++ stdenv.lib.optionals stdenv.isDarwin [
     ./no-lto.patch
@@ -77,10 +78,6 @@ buildPythonApplication rec {
     ./png2icns.patch
   ];
 
-  preConfigure  = stdenv.lib.optional (!stdenv.isDarwin) ''
-    substituteInPlace glfw/egl_context.c --replace "libEGL.so.1" "${stdenv.lib.getLib libGL}/lib/libEGL.so.1"
-  '';
-
   buildPhase = if stdenv.isDarwin then ''
     ${python.interpreter} setup.py kitty.app --update-check-interval=0
   '' else ''