Merge pull request #205843 from fgaz/evilpixie/0.3

evilpixie: 0.2.1 -> 0.3
This commit is contained in:
Guillaume Girol 2022-12-16 21:17:50 +00:00 committed by GitHub
commit 7c2e65f3f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 30 deletions

View File

@ -1,52 +1,43 @@
{ mkDerivation { lib
, lib , stdenv
, fetchFromGitHub , fetchFromGitHub
, makeDesktopItem , meson
, qmake , ninja
, pkg-config
, wrapQtAppsHook
, qtbase , qtbase
, libpng , libpng
, giflib , giflib
, libjpeg
, impy , impy
}: }:
let stdenv.mkDerivation rec {
desktopItem = makeDesktopItem {
name = "EvilPixie";
desktopName = "EvilPixie";
exec = "evilpixie %F";
icon = "evilpixie";
genericName = "Image Editor";
categories = [ "Graphics" "2DGraphics" "RasterGraphics" ];
mimeTypes = [ "image/bmp" "image/gif" "image/jpeg" "image/jpg" "image/png" "image/x-pcx" "image/x-targa" "image/x-tga" ];
};
in mkDerivation rec {
pname = "evilpixie"; pname = "evilpixie";
version = "0.2.1"; version = "0.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bcampbell"; owner = "bcampbell";
repo = "evilpixie"; repo = "evilpixie";
rev = "v${version}"; rev = "v${version}";
sha256 = "0dwgfr8kmkfppgf5wx9i5f7fjz3gxk0ji1l06x1z4r3vj52hdbph"; sha256 = "sha256-t7ccaMXaCanCyn3oV8WJ11bhF7xTBkd992AheFJpSGQ=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
qmake meson
ninja
pkg-config
wrapQtAppsHook
]; ];
buildInputs = [ buildInputs = [
qtbase qtbase
libpng libpng
giflib giflib
libjpeg
impy impy
]; ];
postInstall = ''
ln -s ${desktopItem}/share/applications $out/share
install -Dm 444 icon_128x128.png $out/share/icons/hicolor/128x128/apps/evilpixie.png
'';
meta = with lib; { meta = with lib; {
description = "Pixel-oriented paint program, modelled on Deluxe Paint"; description = "Pixel-oriented paint program, modelled on Deluxe Paint";
homepage = "https://github.com/bcampbell/evilpixie"; # http://evilpixie.scumways.com/ is gone homepage = "https://github.com/bcampbell/evilpixie"; # http://evilpixie.scumways.com/ is gone
@ -54,6 +45,11 @@ in mkDerivation rec {
license = licenses.gpl3Only; license = licenses.gpl3Only;
maintainers = with maintainers; [ fgaz ]; maintainers = with maintainers; [ fgaz ];
platforms = platforms.all; platforms = platforms.all;
# Undefined symbols for architecture x86_64:
# "_bundle_path", referenced from: App::SetupPaths() in src_app.cpp.o
broken = stdenv.isDarwin ||
# https://github.com/bcampbell/evilpixie/issues/28
stdenv.isAarch64;
}; };
} }

View File

@ -1,27 +1,28 @@
{ lib, stdenv { lib, stdenv
, fetchFromGitHub , fetchFromGitHub
, cmake , meson
, ninja
, pkg-config , pkg-config
, libpng , libpng
, zlib , zlib
, giflib , giflib
, libjpeg , libjpeg
, SDL2
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "impy"; pname = "impy";
version = "0.1"; version = "0.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bcampbell"; owner = "bcampbell";
repo = "impy"; repo = "impy";
rev = "v${version}"; rev = "v${version}";
sha256 = "1h45xjms56radhknspyx17a12dpnm7xgqm1x1chy42aw5ic8b5qf"; sha256 = "sha256-0bHm3jawYgcIeF2COALWlypX7kvPw1hifB/W+TKcC4M=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
cmake meson
ninja
pkg-config pkg-config
]; ];
@ -30,7 +31,6 @@ stdenv.mkDerivation rec {
zlib zlib
giflib giflib
libjpeg libjpeg
SDL2
]; ];
meta = with lib; { meta = with lib; {