From 47f42b8841f753683dcedd6dea08aaa3834d601e Mon Sep 17 00:00:00 2001 From: awwpotato Date: Fri, 18 Apr 2025 20:35:31 -0700 Subject: [PATCH 1/4] libfakeXinerama: cleanup --- pkgs/tools/X11/xpra/libfakeXinerama.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/X11/xpra/libfakeXinerama.nix b/pkgs/tools/X11/xpra/libfakeXinerama.nix index 2b533c1aacca..51f16727c4ec 100644 --- a/pkgs/tools/X11/xpra/libfakeXinerama.nix +++ b/pkgs/tools/X11/xpra/libfakeXinerama.nix @@ -6,12 +6,12 @@ libXinerama, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libfakeXinerama"; version = "0.1.0"; src = fetchurl { - url = "https://www.xpra.org/src/${pname}-${version}.tar.bz2"; + url = "https://www.xpra.org/src/libfakeXinerama-${finalAttrs.version}.tar.bz2"; sha256 = "0gxb8jska2anbb3c1m8asbglgnwylgdr44x9lr8yh91hjxsqadkx"; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.nickcao ]; license = lib.licenses.mit; }; -} +}) From e80a4c4b15a483565e82fb8790702eb635c507d3 Mon Sep 17 00:00:00 2001 From: awwpotato Date: Fri, 18 Apr 2025 20:39:12 -0700 Subject: [PATCH 2/4] libfakeXinerama: move to by-name --- .../li/libfakeXinerama/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/X11/xpra/libfakeXinerama.nix => by-name/li/libfakeXinerama/package.nix} (100%) diff --git a/pkgs/tools/X11/xpra/libfakeXinerama.nix b/pkgs/by-name/li/libfakeXinerama/package.nix similarity index 100% rename from pkgs/tools/X11/xpra/libfakeXinerama.nix rename to pkgs/by-name/li/libfakeXinerama/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e02b83ccb7c4..57ff98525525 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16818,12 +16818,10 @@ with pkgs; libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { }; - xpra = callPackage ../tools/X11/xpra { }; xpraWithNvenc = callPackage ../tools/X11/xpra { withNvenc = true; nvidia_x11 = linuxPackages.nvidia_x11.override { libsOnly = true; }; }; - libfakeXinerama = callPackage ../tools/X11/xpra/libfakeXinerama.nix { }; xmp = callPackage ../applications/audio/xmp { inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio; From 23e0d283d945f52942bf9bef87bf83921ba4ffde Mon Sep 17 00:00:00 2001 From: awwpotato Date: Fri, 18 Apr 2025 20:40:01 -0700 Subject: [PATCH 3/4] xpra: move to by-name --- pkgs/{tools/X11 => by-name/xp}/xpra/0002-Constant-DPI.patch | 0 pkgs/{tools/X11 => by-name/xp}/xpra/0003-fix-pointer-limits.patch | 0 pkgs/{tools/X11 => by-name/xp}/xpra/fix-122159.patch | 0 pkgs/{tools/X11 => by-name/xp}/xpra/fix-41106.patch | 0 pkgs/{tools/X11 => by-name/xp}/xpra/nvenc.pc | 0 pkgs/{tools/X11/xpra/default.nix => by-name/xp/xpra/package.nix} | 0 pkgs/{tools/X11 => by-name/xp}/xpra/update.sh | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename pkgs/{tools/X11 => by-name/xp}/xpra/0002-Constant-DPI.patch (100%) rename pkgs/{tools/X11 => by-name/xp}/xpra/0003-fix-pointer-limits.patch (100%) rename pkgs/{tools/X11 => by-name/xp}/xpra/fix-122159.patch (100%) rename pkgs/{tools/X11 => by-name/xp}/xpra/fix-41106.patch (100%) rename pkgs/{tools/X11 => by-name/xp}/xpra/nvenc.pc (100%) rename pkgs/{tools/X11/xpra/default.nix => by-name/xp/xpra/package.nix} (100%) rename pkgs/{tools/X11 => by-name/xp}/xpra/update.sh (100%) diff --git a/pkgs/tools/X11/xpra/0002-Constant-DPI.patch b/pkgs/by-name/xp/xpra/0002-Constant-DPI.patch similarity index 100% rename from pkgs/tools/X11/xpra/0002-Constant-DPI.patch rename to pkgs/by-name/xp/xpra/0002-Constant-DPI.patch diff --git a/pkgs/tools/X11/xpra/0003-fix-pointer-limits.patch b/pkgs/by-name/xp/xpra/0003-fix-pointer-limits.patch similarity index 100% rename from pkgs/tools/X11/xpra/0003-fix-pointer-limits.patch rename to pkgs/by-name/xp/xpra/0003-fix-pointer-limits.patch diff --git a/pkgs/tools/X11/xpra/fix-122159.patch b/pkgs/by-name/xp/xpra/fix-122159.patch similarity index 100% rename from pkgs/tools/X11/xpra/fix-122159.patch rename to pkgs/by-name/xp/xpra/fix-122159.patch diff --git a/pkgs/tools/X11/xpra/fix-41106.patch b/pkgs/by-name/xp/xpra/fix-41106.patch similarity index 100% rename from pkgs/tools/X11/xpra/fix-41106.patch rename to pkgs/by-name/xp/xpra/fix-41106.patch diff --git a/pkgs/tools/X11/xpra/nvenc.pc b/pkgs/by-name/xp/xpra/nvenc.pc similarity index 100% rename from pkgs/tools/X11/xpra/nvenc.pc rename to pkgs/by-name/xp/xpra/nvenc.pc diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/by-name/xp/xpra/package.nix similarity index 100% rename from pkgs/tools/X11/xpra/default.nix rename to pkgs/by-name/xp/xpra/package.nix diff --git a/pkgs/tools/X11/xpra/update.sh b/pkgs/by-name/xp/xpra/update.sh similarity index 100% rename from pkgs/tools/X11/xpra/update.sh rename to pkgs/by-name/xp/xpra/update.sh From 5b5c0ecf868304664b0cc5898a386cf6149a11dd Mon Sep 17 00:00:00 2001 From: awwpotato Date: Fri, 18 Apr 2025 20:34:20 -0700 Subject: [PATCH 4/4] xpraWithNvenc: move to by-name --- pkgs/by-name/xp/xpraWithNvenc/package.nix | 8 ++++++++ pkgs/top-level/all-packages.nix | 5 ----- 2 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 pkgs/by-name/xp/xpraWithNvenc/package.nix diff --git a/pkgs/by-name/xp/xpraWithNvenc/package.nix b/pkgs/by-name/xp/xpraWithNvenc/package.nix new file mode 100644 index 000000000000..169c3a657a19 --- /dev/null +++ b/pkgs/by-name/xp/xpraWithNvenc/package.nix @@ -0,0 +1,8 @@ +{ + xpra, + linuxPackages, +}: +xpra.override { + withNvenc = true; + nvidia_x11 = linuxPackages.nvidia_x11.override { libsOnly = true; }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 57ff98525525..42c4df87aaeb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16818,11 +16818,6 @@ with pkgs; libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { }; - xpraWithNvenc = callPackage ../tools/X11/xpra { - withNvenc = true; - nvidia_x11 = linuxPackages.nvidia_x11.override { libsOnly = true; }; - }; - xmp = callPackage ../applications/audio/xmp { inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio; };