diff --git a/pkgs/by-name/di/dippi/package.nix b/pkgs/by-name/di/dippi/package.nix new file mode 100644 index 000000000000..14865ba980ec --- /dev/null +++ b/pkgs/by-name/di/dippi/package.nix @@ -0,0 +1,52 @@ +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + pkg-config, + vala, + glib, + gtk4, + libadwaita, + wrapGAppsHook4, + appstream-glib, + desktop-file-utils, +}: + +stdenv.mkDerivation rec { + pname = "dippi"; + version = "4.1.0"; + + src = fetchFromGitHub { + owner = "cassidyjames"; + repo = "dippi"; + rev = version; + hash = "sha256-BYI3WqMDxzERlqtq7ISQ+U1FTrpKh5OJBMo/AsdmdlQ="; + }; + + nativeBuildInputs = [ + meson + ninja + vala + pkg-config + wrapGAppsHook4 + appstream-glib + desktop-file-utils + ]; + + buildInputs = [ + glib + gtk4 + libadwaita + ]; + + meta = { + description = "Calculate display info like DPI and aspect ratio"; + homepage = "https://github.com/cassidyjames/dippi"; + mainProgram = "com.github.cassidyjames.dippi"; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ zendo ]; + }; +} diff --git a/pkgs/tools/graphics/dippi/default.nix b/pkgs/tools/graphics/dippi/default.nix deleted file mode 100644 index 1a094c2750e2..000000000000 --- a/pkgs/tools/graphics/dippi/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, meson -, ninja -, pkg-config -, python3 -, vala -, glib -, gtk3 -, gtk4 -, libadwaita -, wrapGAppsHook4 -, appstream-glib -, desktop-file-utils -}: - -stdenv.mkDerivation rec { - pname = "dippi"; - version = "4.0.6"; - - src = fetchFromGitHub { - owner = "cassidyjames"; - repo = "dippi"; - rev = version; - hash = "sha256-oZy8WfaAPABZRm8dm4zpI4v9RwT46F6WL6Wj767FcZg="; - }; - - nativeBuildInputs = [ - meson - ninja - vala - pkg-config - wrapGAppsHook4 - appstream-glib - desktop-file-utils - # For post_install.py - python3 - glib - gtk3 - ]; - - buildInputs = [ - glib - gtk4 - libadwaita - ]; - - postPatch = '' - patchShebangs build-aux/meson/post_install.py - ''; - - postInstall = '' - ln -s $out/bin/com.github.cassidyjames.dippi $out/bin/dippi - ''; - - meta = with lib; { - description = "Calculate display info like DPI and aspect ratio"; - homepage = "https://github.com/cassidyjames/dippi"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ zendo ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 88f56b725a49..c89c6f7b881c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -905,8 +905,6 @@ with pkgs; umoci = callPackage ../applications/virtualization/umoci { }; - dippi = callPackage ../tools/graphics/dippi { }; - diswall = callPackage ../applications/networking/diswall { }; dupeguru = callPackage ../applications/misc/dupeguru {