diff --git a/pkgs/applications/graphics/write_stylus/default.nix b/pkgs/by-name/st/styluslabs-write-bin/package.nix similarity index 83% rename from pkgs/applications/graphics/write_stylus/default.nix rename to pkgs/by-name/st/styluslabs-write-bin/package.nix index be20635c5001..4e5ca2af4942 100644 --- a/pkgs/applications/graphics/write_stylus/default.nix +++ b/pkgs/by-name/st/styluslabs-write-bin/package.nix @@ -1,4 +1,4 @@ -{ mkDerivation, stdenv, lib, qtbase, qtsvg, libglvnd, libX11, libXi, fetchurl, makeDesktopItem }: +{ stdenv, lib, libsForQt5, libglvnd, libX11, libXi, fetchurl, makeDesktopItem }: let desktopItem = makeDesktopItem { name = "Write"; @@ -10,8 +10,8 @@ let categories = [ "Office" "Graphics" ]; }; in -mkDerivation rec { - pname = "write_stylus"; +stdenv.mkDerivation rec { + pname = "styluslabs-write-bin"; version = "300"; src = fetchurl { @@ -37,8 +37,8 @@ mkDerivation rec { ''; preFixup = let libPath = lib.makeLibraryPath [ - qtbase # libQt5PrintSupport.so.5 - qtsvg # libQt5Svg.so.5 + libsForQt5.qtbase # libQt5PrintSupport.so.5 + libsForQt5.qtsvg # libQt5Svg.so.5 stdenv.cc.cc.lib # libstdc++.so.6 libglvnd # libGL.so.1 libX11 # libX11.so.6 @@ -57,6 +57,6 @@ mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = platforms.linux; license = lib.licenses.unfree; - maintainers = with maintainers; [ oyren ]; + maintainers = with maintainers; [ oyren lukts30 atemu ]; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 88b828c32cbe..761c445f9841 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1699,6 +1699,7 @@ mapAliases { wrapLisp_old = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 wmii_hg = wmii; wrapGAppsHook = wrapGAppsHook3; # Added 2024-03-26 + write_stylus = styluslabs-write-bin; # Added 2024-10-09 wxGTK30 = throw "wxGTK30 has been removed from nixpkgs as it has reached end of life"; # Added 2023-03-22 wxGTK30-gtk2 = wxGTK30; # Added 2022-12-03 wxGTK30-gtk3 = wxGTK30; # Added 2022-12-03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 787f20384e3c..72c1e28d02f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33635,8 +33635,6 @@ with pkgs; wings = callPackage ../applications/graphics/wings { }; - write_stylus = libsForQt5.callPackage ../applications/graphics/write_stylus { }; - wlc = callPackage ../tools/misc/wlc { }; wlclock = callPackage ../applications/misc/wlclock { };