diff --git a/pkgs/applications/misc/lsd2dsl/default.nix b/pkgs/by-name/ls/lsd2dsl/package.nix similarity index 76% rename from pkgs/applications/misc/lsd2dsl/default.nix rename to pkgs/by-name/ls/lsd2dsl/package.nix index b46c6ea2afa3..40907c2c0e9d 100644 --- a/pkgs/applications/misc/lsd2dsl/default.nix +++ b/pkgs/by-name/ls/lsd2dsl/package.nix @@ -1,21 +1,21 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , makeDesktopItem, copyDesktopItems, cmake -, boost, libvorbis, libsndfile, minizip, gtest, qtwebkit }: +, boost, libvorbis, libsndfile, minizip, gtest, qt5 }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "lsd2dsl"; version = "0.5.4"; src = fetchFromGitHub { owner = "nongeneric"; - repo = pname; + repo = "lsd2dsl"; rev = "v${version}"; sha256 = "sha256-PLgfsVVrNBTxI4J0ukEOFRoBkbmB55/sLNn5KyiHeAc="; }; - nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.isLinux copyDesktopItems; + nativeBuildInputs = [ cmake qt5.wrapQtAppsHook ] ++ lib.optional stdenv.isLinux copyDesktopItems; - buildInputs = [ boost libvorbis libsndfile minizip gtest qtwebkit ]; + buildInputs = [ boost libvorbis libsndfile minizip gtest qt5.qtwebkit ]; env.NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=missing-braces"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da5c8d5e0b37..236dd723eaae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33251,8 +33251,6 @@ with pkgs; loxodo = callPackage ../applications/misc/loxodo { }; - lsd2dsl = libsForQt5.callPackage ../applications/misc/lsd2dsl { }; - lrzsz = callPackage ../tools/misc/lrzsz { }; lsp-plugins = callPackage ../applications/audio/lsp-plugins { php = php81; };