diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/by-name/pi/pipelight/package.nix
similarity index 87%
rename from pkgs/tools/misc/pipelight/default.nix
rename to pkgs/by-name/pi/pipelight/package.nix
index fc02f9e2a040..d0b4c77d26e6 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,23 +9,25 @@
   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 (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";
   };
 
@@ -90,4 +92,4 @@ stdenv.mkDerivation rec {
     ];
     mainProgram = "pipelight-plugin";
   };
-}
+})
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;