From 1af17eb7b74b1e4f4c5019b2028da1011aa95882 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Tue, 17 Mar 2026 10:23:31 -0500 Subject: [PATCH 1/2] pipelight: migrate to by-name --- .../default.nix => by-name/pi/pipelight/package.nix} | 10 ++++++---- .../misc => by-name/pi}/pipelight/pipelight.patch | 0 .../pi}/pipelight/wine-6.13-new-args.patch | 0 .../pi}/pipelight/wine-7.10-ControlMask.patch | 0 pkgs/top-level/all-packages.nix | 5 ----- 5 files changed, 6 insertions(+), 9 deletions(-) rename pkgs/{tools/misc/pipelight/default.nix => by-name/pi/pipelight/package.nix} (93%) rename pkgs/{tools/misc => by-name/pi}/pipelight/pipelight.patch (100%) rename pkgs/{tools/misc => by-name/pi}/pipelight/wine-6.13-new-args.patch (100%) rename pkgs/{tools/misc => by-name/pi}/pipelight/wine-7.10-ControlMask.patch (100%) diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/by-name/pi/pipelight/package.nix similarity index 93% rename from pkgs/tools/misc/pipelight/default.nix rename to pkgs/by-name/pi/pipelight/package.nix index fc02f9e2a040..3803e3a1214f 100644 --- a/pkgs/tools/misc/pipelight/default.nix +++ b/pkgs/by-name/pi/pipelight/package.nix @@ -1,6 +1,6 @@ { lib, - stdenv, + stdenv_32bit, fetchurl, bash, cabextract, @@ -9,16 +9,18 @@ libx11, libGLU, libGL, - wine-staging, + pkgsi686Linux, }: let - wine_custom = wine-staging; + wine_custom = pkgsi686Linux.wine-staging; mozillaPluginPath = "/lib/mozilla/plugins"; + stdenv' = stdenv_32bit; + in -stdenv.mkDerivation rec { +stdenv'.mkDerivation rec { version = "0.2.8.2"; diff --git a/pkgs/tools/misc/pipelight/pipelight.patch b/pkgs/by-name/pi/pipelight/pipelight.patch similarity index 100% rename from pkgs/tools/misc/pipelight/pipelight.patch rename to pkgs/by-name/pi/pipelight/pipelight.patch diff --git a/pkgs/tools/misc/pipelight/wine-6.13-new-args.patch b/pkgs/by-name/pi/pipelight/wine-6.13-new-args.patch similarity index 100% rename from pkgs/tools/misc/pipelight/wine-6.13-new-args.patch rename to pkgs/by-name/pi/pipelight/wine-6.13-new-args.patch diff --git a/pkgs/tools/misc/pipelight/wine-7.10-ControlMask.patch b/pkgs/by-name/pi/pipelight/wine-7.10-ControlMask.patch similarity index 100% rename from pkgs/tools/misc/pipelight/wine-7.10-ControlMask.patch rename to pkgs/by-name/pi/pipelight/wine-7.10-ControlMask.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 482e12986ad6..32ff1d1662c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7239,11 +7239,6 @@ with pkgs; physfs ; - pipelight = callPackage ../tools/misc/pipelight { - stdenv = stdenv_32bit; - wine-staging = pkgsi686Linux.wine-staging; - }; - place-cursor-at = haskell.lib.compose.justStaticExecutables haskellPackages.place-cursor-at; podofo = podofo_1_0; From d8cc28922dd58b51a88323dccc0f6505485de25f Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Tue, 17 Mar 2026 10:25:25 -0500 Subject: [PATCH 2/2] pipelight: modernize derivation --- pkgs/by-name/pi/pipelight/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pi/pipelight/package.nix b/pkgs/by-name/pi/pipelight/package.nix index 3803e3a1214f..d0b4c77d26e6 100644 --- a/pkgs/by-name/pi/pipelight/package.nix +++ b/pkgs/by-name/pi/pipelight/package.nix @@ -20,14 +20,14 @@ let stdenv' = stdenv_32bit; in -stdenv'.mkDerivation rec { +stdenv'.mkDerivation (finalAttrs: { version = "0.2.8.2"; pname = "pipelight"; src = fetchurl { - url = "https://bitbucket.org/mmueller2012/pipelight/get/v${version}.tar.gz"; + url = "https://bitbucket.org/mmueller2012/pipelight/get/v${finalAttrs.version}.tar.gz"; sha256 = "1kyy6knkr42k34rs661r0f5sf6l1s2jdbphdg89n73ynijqmzjhk"; }; @@ -92,4 +92,4 @@ stdenv'.mkDerivation rec { ]; mainProgram = "pipelight-plugin"; }; -} +})