diff --git a/pkgs/applications/misc/pdfarranger/default.nix b/pkgs/by-name/pd/pdfarranger/package.nix similarity index 59% rename from pkgs/applications/misc/pdfarranger/default.nix rename to pkgs/by-name/pd/pdfarranger/package.nix index 5dda053eb753..bcbad7a32dcb 100644 --- a/pkgs/applications/misc/pdfarranger/default.nix +++ b/pkgs/by-name/pd/pdfarranger/package.nix @@ -1,10 +1,11 @@ -{ fetchFromGitHub -, lib -, wrapGAppsHook3 -, python3Packages -, gtk3 -, poppler_gi -, libhandy +{ + fetchFromGitHub, + lib, + wrapGAppsHook3, + python3Packages, + gtk3, + poppler_gi, + libhandy, }: python3Packages.buildPythonApplication rec { @@ -19,11 +20,9 @@ python3Packages.buildPythonApplication rec { hash = "sha256-bHV6EluA7xp+HyejnSWJwfRBDcTuZq5Gzz0KWIs0qhA="; }; - nativeBuildInputs = [ - wrapGAppsHook3 - ] ++ (with python3Packages; [ - setuptools - ]); + nativeBuildInputs = [ wrapGAppsHook3 ]; + + build-system = with python3Packages; [ setuptools ]; buildInputs = [ gtk3 @@ -31,7 +30,7 @@ python3Packages.buildPythonApplication rec { libhandy ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ pygobject3 pikepdf img2pdf @@ -42,19 +41,17 @@ python3Packages.buildPythonApplication rec { # incompatible with wrapGAppsHook3 strictDeps = false; dontWrapGApps = true; - preFixup = '' - makeWrapperArgs+=("''${gappsWrapperArgs[@]}") - ''; + makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ]; doCheck = false; # no tests - meta = with lib; { + meta = { inherit (src.meta) homepage; - description = "Merge or split pdf documents and rotate, crop and rearrange their pages using an interactive and intuitive graphical interface"; + description = "Merge or split pdf documents and rotate, crop and rearrange their pages using a graphical interface"; mainProgram = "pdfarranger"; - platforms = platforms.linux; - maintainers = with maintainers; [ symphorien ]; - license = licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ symphorien ]; + license = lib.licenses.gpl3Plus; changelog = "https://github.com/pdfarranger/pdfarranger/releases/tag/${version}"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c507793b0beb..f9e889de1649 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11597,8 +11597,6 @@ with pkgs; pdf-quench = callPackage ../applications/misc/pdf-quench { }; - pdfarranger = callPackage ../applications/misc/pdfarranger { }; - briss = callPackage ../tools/graphics/briss { }; brickd = callPackage ../servers/brickd { };