From 15002bf1fb27dbb4e595c8eaeccf8685137766f3 Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Tue, 21 Apr 2020 22:03:38 +0200 Subject: [PATCH 1/2] libfakeXinerama: fix dangling symlinks --- pkgs/tools/X11/xpra/libfakeXinerama.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/X11/xpra/libfakeXinerama.nix b/pkgs/tools/X11/xpra/libfakeXinerama.nix index 712f47fb2c8..da5be29cae1 100644 --- a/pkgs/tools/X11/xpra/libfakeXinerama.nix +++ b/pkgs/tools/X11/xpra/libfakeXinerama.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/lib cp libfakeXinerama.so.1.0 $out/lib + ln -s libfakeXinerama.so.1.0 $out/lib/libXinerama.so.1.0 ln -s libXinerama.so.1.0 $out/lib/libXinerama.so.1 ln -s libXinerama.so.1 $out/lib/libXinerama.so ''; From 3573aef274435abd0eb4b93a3a232391cc6efbf9 Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Wed, 6 May 2020 12:00:16 +0200 Subject: [PATCH 2/2] libfakeXinerama: remove deprecated pattern per #28910 --- pkgs/tools/X11/xpra/libfakeXinerama.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/tools/X11/xpra/libfakeXinerama.nix b/pkgs/tools/X11/xpra/libfakeXinerama.nix index da5be29cae1..e43043d78f2 100644 --- a/pkgs/tools/X11/xpra/libfakeXinerama.nix +++ b/pkgs/tools/X11/xpra/libfakeXinerama.nix @@ -11,8 +11,6 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 libXinerama ]; - phases = [ "unpackPhase" "buildPhase" "installPhase" ]; - buildPhase = '' gcc -O2 -Wall fakeXinerama.c -fPIC -o libfakeXinerama.so.1.0 -shared '';