Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f01161226afe
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5c0b0f33e49d
Choose a head ref
  • 1 commit
  • 1 file changed
  • 2 contributors

Commits on Dec 11, 2020

  1. mcomix3: manpage location, app icon (#105450)

    Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
    con-f-use and SuperSandro2000 authored Dec 11, 2020

    Partially verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
    Copy the full SHA
    5c0b0f3 View commit details
Showing with 11 additions and 7 deletions.
  1. +11 −7 pkgs/applications/graphics/mcomix3/default.nix
18 changes: 11 additions & 7 deletions pkgs/applications/graphics/mcomix3/default.nix
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
{ stdenv
, lib
, fetchFromGitHub
, python3
, wrapGAppsHook
, installShellFiles
, python3
, gobject-introspection
, gtk3
, gdk-pixbuf

# Recommended Dependencies:
, unrarSupport ? false
, unrarSupport ? false # unfree software
, unrar
, p7zip
, lhasa
@@ -18,7 +20,7 @@ python3.pkgs.buildPythonApplication rec {
pname = "mcomix3";
version = "unstable-2020-11-23";

# fetch from github because no official release on pypi/github and no build system
# no official release on pypi/github and no build system
src = fetchFromGitHub {
repo = "${pname}";
owner = "multiSnow";
@@ -27,7 +29,7 @@ python3.pkgs.buildPythonApplication rec {
};

buildInputs = [ gobject-introspection gtk3 gdk-pixbuf ];
nativeBuildInputs = [ wrapGAppsHook ];
nativeBuildInputs = [ wrapGAppsHook installShellFiles ];
propagatedBuildInputs = (with python3.pkgs; [ pillow pygobject3 pycairo ]);

format = "other";
@@ -55,20 +57,22 @@ python3.pkgs.buildPythonApplication rec {

postInstall = ''
rmdir $libdir/mcomix/mcomix
cp man/* $out/share/man/man1/
mv man/mcomix.1 man/${pname}.1
installManPage man/*
cp -r mime/icons/* $out/share/icons/hicolor/
cp mime/*.desktop $out/share/applications/
cp mime/*.appdata.xml $out/share/metainfo/
cp mime/*.thumbnailer $out/share/thumbnailers/
for folder in $out/share/icons/hicolor/*; do
mkdir $folder/{apps,mimetypes}
mv $folder/*.png $folder/mimetypes
cp $libdir/mcomix/images/$(basename $folder)/mcomix.png $folder/apps/${pname}.png
cp $folder/mimetypes/application-x-cbt.png $folder/mimetypes/application-x-cbr.png
cp $folder/mimetypes/application-x-cbt.png $folder/mimetypes/application-x-cbz.png
done
'';

# to prevent double wrapping
# prevent double wrapping
dontWrapGApps = true;
preFixup = ''
makeWrapperArgs+=(
@@ -77,7 +81,7 @@ python3.pkgs.buildPythonApplication rec {
)
'';

# real pytests seem to be broken upstream
# real pytests broken upstream
checkPhase = ''
$out/bin/comicthumb --help > /dev/null
$out/bin/${pname} --help > /dev/null