diff options
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/ImageMagick/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/graphics/comical/default.nix | 24 | ||||
| -rw-r--r-- | pkgs/applications/graphics/comical/wxgtk-2.8.patch | 36 | ||||
| -rw-r--r-- | pkgs/applications/graphics/comical/wxgtk-3.2.patch | 139 | ||||
| -rw-r--r-- | pkgs/applications/graphics/epick/default.nix | 27 | ||||
| -rw-r--r-- | pkgs/applications/graphics/eyedropper/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/graphics/hydrus/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/applications/graphics/kcc/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/graphics/xournalpp/default.nix | 6 |
9 files changed, 183 insertions, 66 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 8c7e3f2c4aa01..5b793b38e172b 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -46,13 +46,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-49"; + version = "7.1.0-51"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - hash = "sha256-5EbmAPEUPFMY8VDJmXfcFuUzFI0xVw7fpVteSI9gotg="; + hash = "sha256-u2QUtCQ4LzS60iVOOKWx/itmC9uMxPhNvsNANPHrvpE="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big diff --git a/pkgs/applications/graphics/comical/default.nix b/pkgs/applications/graphics/comical/default.nix index 36da9d26410ed..095905ff06d8a 100644 --- a/pkgs/applications/graphics/comical/default.nix +++ b/pkgs/applications/graphics/comical/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, wxGTK, util-linux, zlib }: +{ lib, stdenv, fetchurl, wxGTK32, util-linux, zlib, Cocoa }: stdenv.mkDerivation rec { pname = "comical"; @@ -9,10 +9,21 @@ stdenv.mkDerivation rec { sha256 = "0b6527cc06b25a937041f1eb248d0fd881cf055362097036b939817f785ab85e"; }; - buildInputs = [ wxGTK util-linux zlib ]; - makeFlags = [ "prefix=${placeholder "out"}" ]; + patches = [ ./wxgtk-3.2.patch ]; - patches = [ ./wxgtk-2.8.patch ]; + buildInputs = [ + wxGTK32 + util-linux + zlib + ] ++ lib.optionals stdenv.isDarwin [ + Cocoa + ]; + + makeFlags = [ + "prefix=${placeholder "out"}" + "CC=${stdenv.cc.targetPrefix}cc" + "CXX=${stdenv.cc.targetPrefix}c++" + ]; preInstall = "mkdir -pv $out/bin"; @@ -20,7 +31,8 @@ stdenv.mkDerivation rec { description = "Viewer of CBR and CBZ files, often used to store scanned comics"; homepage = "http://comical.sourceforge.net/"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ viric ]; - platforms = with lib.platforms; linux; + maintainers = with lib.maintainers; [ viric wegank ]; + platforms = with lib.platforms; unix; + mainProgram = "comical"; }; } diff --git a/pkgs/applications/graphics/comical/wxgtk-2.8.patch b/pkgs/applications/graphics/comical/wxgtk-2.8.patch deleted file mode 100644 index db7626074a0f4..0000000000000 --- a/pkgs/applications/graphics/comical/wxgtk-2.8.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/Makefile b/Makefile -index a648e72..181c47f 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,5 +1,5 @@ - CC = `wx-config --cxx` --LDFLAGS = `wx-config --libs` -Lunrar -lunrar -Lunzip -lminiunzip -+LDFLAGS = `wx-config --libs` -Lunrar -lunrar -Lunzip -lminiunzip -lz - INSTALL = install - INSTALL_PROGRAM = $(INSTALL) - prefix = /usr/local -diff --git a/src/ComicalApp.cpp b/src/ComicalApp.cpp -index 0c004cd..667e75e 100644 ---- a/src/ComicalApp.cpp -+++ b/src/ComicalApp.cpp -@@ -28,6 +28,7 @@ - #include "ComicalApp.h" - #include "ComicalFrame.h" - #include <wx/log.h> -+#include <wx/icon.h> - - #if !defined(__WXMAC__) && !defined(__WXCOCOA__) && !defined(__WXMSW__) && !defined(__WXPM__) - #include "../Comical Icons/comical.xpm" -diff --git a/unzip/unzip.h b/unzip/unzip.h -index b247937..5bb6a69 100644 ---- a/unzip/unzip.h -+++ b/unzip/unzip.h -@@ -50,7 +50,7 @@ extern "C" { - #endif - - #ifndef _ZLIB_H --#include "zlib.h" -+#include <zlib.h> - #endif - - #ifndef _ZLIBIOAPI_H diff --git a/pkgs/applications/graphics/comical/wxgtk-3.2.patch b/pkgs/applications/graphics/comical/wxgtk-3.2.patch new file mode 100644 index 0000000000000..72bafd733ce33 --- /dev/null +++ b/pkgs/applications/graphics/comical/wxgtk-3.2.patch @@ -0,0 +1,139 @@ +diff --git a/Makefile b/Makefile +index a648e72..0387ac1 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,5 +1,5 @@ +-CC = `wx-config --cxx` +-LDFLAGS = `wx-config --libs` -Lunrar -lunrar -Lunzip -lminiunzip ++WX_CC = `wx-config --cxx` ++LDFLAGS = `wx-config --libs` -Lunrar -lunrar -Lunzip -lminiunzip -lz + INSTALL = install + INSTALL_PROGRAM = $(INSTALL) + prefix = /usr/local +@@ -13,7 +13,7 @@ OBJS = $(patsubst %.cpp,%.o,$(wildcard src/*.cpp)) + all: comical + + comical: $(OBJS) unrar/libunrar.a unzip/libminiunzip.a +- $(CC) -o $@ $(OBJS) $(LDFLAGS) ++ $(WX_CC) -o $@ $(OBJS) $(LDFLAGS) + + $(OBJS): + $(MAKE) -C src +diff --git a/src/ComicalApp.cpp b/src/ComicalApp.cpp +index 0c004cd..667e75e 100644 +--- a/src/ComicalApp.cpp ++++ b/src/ComicalApp.cpp +@@ -28,6 +28,7 @@ + #include "ComicalApp.h" + #include "ComicalFrame.h" + #include <wx/log.h> ++#include <wx/icon.h> + + #if !defined(__WXMAC__) && !defined(__WXCOCOA__) && !defined(__WXMSW__) && !defined(__WXPM__) + #include "../Comical Icons/comical.xpm" +diff --git a/src/ComicalCanvas.cpp b/src/ComicalCanvas.cpp +index 75da72f..febce50 100644 +--- a/src/ComicalCanvas.cpp ++++ b/src/ComicalCanvas.cpp +@@ -792,11 +792,11 @@ void ComicalCanvas::OnKeyDown(wxKeyEvent& event) + + switch(event.GetKeyCode()) { + +- case WXK_PRIOR: ++ case WXK_PAGEUP: + PrevPageTurn(); + break; + +- case WXK_NEXT: ++ case WXK_PAGEDOWN: + NextPageTurn(); + break; + +diff --git a/src/ComicalFrame.cpp b/src/ComicalFrame.cpp +index 2256be8..154fd6d 100644 +--- a/src/ComicalFrame.cpp ++++ b/src/ComicalFrame.cpp +@@ -240,7 +240,7 @@ ComicalFrame::ComicalFrame(const wxString& title, const wxPoint& pos, const wxSi + toolbarSizer->AddSpacer(10); + toolbarSizer->Add(toolBarNav, 0, wxALIGN_CENTER, 0); + toolbarSizer->AddSpacer(10); +- toolbarSizer->Add(labelRight, 1, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL, 0); ++ toolbarSizer->Add(labelRight, 1, wxALIGN_CENTER_VERTICAL, 0); + toolbarSizer->Layout(); + bookPanelSizer->Add(toolbarSizer, 0, wxEXPAND, 0); + frameSizer->Add(bookPanelSizer, 1, wxEXPAND); +@@ -279,12 +279,12 @@ void ComicalFrame::OnClose(wxCloseEvent& event) + + wxRect frameDim = GetRect(); + config->Write(wxT("CacheLength"), (int) cacheLen); +- config->Write(wxT("Zoom"), zoom); ++ config->Write(wxT("Zoom"), (int) zoom); + config->Write(wxT("ZoomLevel"), zoomLevel); + config->Write(wxT("FitOnlyOversize"), fitOnlyOversize); +- config->Write(wxT("Filter"), filter); +- config->Write(wxT("Mode"), mode); +- config->Write(wxT("Direction"), direction); ++ config->Write(wxT("Filter"), (int) filter); ++ config->Write(wxT("Mode"), (int) mode); ++ config->Write(wxT("Direction"), (int) direction); + config->Write(wxT("FrameWidth"), frameDim.width); + config->Write(wxT("FrameHeight"), frameDim.height); + config->Write(wxT("FrameX"), frameDim.x); +@@ -309,7 +309,7 @@ void ComicalFrame::OnOpen(wxCommandEvent& event) + { + wxString cwd; + config->Read(wxT("CWD"), &cwd); +- wxString filename = wxFileSelector(wxT("Open a Comic Book"), cwd, wxT(""), wxT(""), wxT("Comic Books (*.cbr,*.cbz,*.rar,*.zip)|*.cbr;*.CBR;*.cbz;*.CBZ;*.rar;*.RAR;*.zip;*.ZIP"), wxOPEN | wxCHANGE_DIR | wxFILE_MUST_EXIST, this); ++ wxString filename = wxFileSelector(wxT("Open a Comic Book"), cwd, wxT(""), wxT(""), wxT("Comic Books (*.cbr,*.cbz,*.rar,*.zip)|*.cbr;*.CBR;*.cbz;*.CBZ;*.rar;*.RAR;*.zip;*.ZIP"), wxFD_OPEN | wxFD_CHANGE_DIR | wxFD_FILE_MUST_EXIST, this); + + if (!filename.empty()) + OpenFile(filename); +diff --git a/src/ComicalManager.cpp b/src/ComicalManager.cpp +index 12d8334..b10d8fa 100644 +--- a/src/ComicalManager.cpp ++++ b/src/ComicalManager.cpp +@@ -27,7 +27,7 @@ + + #include "ComicalManager.h" + +-ComicalManager::ComicalManager(ComicalFrame *_frame) : wxDocManager(wxDEFAULT_DOCMAN_FLAGS, false), frame(_frame) ++ComicalManager::ComicalManager(ComicalFrame *_frame) : wxDocManager(0, false), frame(_frame) + { + } + +diff --git a/src/Makefile b/src/Makefile +index 2a7dc3b..e0a9874 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -1,3 +1,4 @@ ++WX_CC = `wx-config --cxx` + INCLUDE = -I../unrar -I../unzip + CFLAGS = -O2 -Wall -pipe + CPPFLAGS = `wx-config --cxxflags` $(CFLAGS) -D_UNIX $(INCLUDE) +@@ -21,11 +22,11 @@ all: $(OBJS) + @echo -e "};\n\n#endif" >> $@ + + %.o : %.cpp +- $(CC) $(CPPFLAGS) -c -o $*.o $< ++ $(WX_CC) $(CPPFLAGS) -c -o $*.o $< + + %.d : %.cpp + @set -e; rm -f $@; \ +- $(CC) -MM -MG $(CPPFLAGS) -MT '$*.o' $< > $@.$$$$; \ ++ $(WX_CC) -MM -MG $(CPPFLAGS) -MT '$*.o' $< > $@.$$$$; \ + sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \ + rm -f $@.$$$$ + +diff --git a/unzip/unzip.h b/unzip/unzip.h +index b247937..5bb6a69 100644 +--- a/unzip/unzip.h ++++ b/unzip/unzip.h +@@ -50,7 +50,7 @@ extern "C" { + #endif + + #ifndef _ZLIB_H +-#include "zlib.h" ++#include <zlib.h> + #endif + + #ifndef _ZLIBIOAPI_H diff --git a/pkgs/applications/graphics/epick/default.nix b/pkgs/applications/graphics/epick/default.nix index c82f4f4d5f80f..fd767e356f12c 100644 --- a/pkgs/applications/graphics/epick/default.nix +++ b/pkgs/applications/graphics/epick/default.nix @@ -2,44 +2,47 @@ , rustPlatform , fetchFromGitHub , stdenv -, python3 +, pkg-config +, expat +, fontconfig +, freetype , libGL , xorg -, libxkbcommon +, darwin , AppKit -, IOKit }: rustPlatform.buildRustPackage rec { pname = "epick"; - version = "0.8.2"; + version = "0.9.0"; src = fetchFromGitHub { owner = "vv9k"; repo = pname; rev = version; - sha256 = "sha256-b4if2ggJY+8CsCX8jbnnWXy16k7sfB88CLlYYCrtltk="; + sha256 = "sha256-k0WQu1n1sAHVor58jr060vD5/2rDrt1k5zzJlrK9WrU="; }; - cargoSha256 = "sha256-HyGSmeLJ+2Twkg94p1QqXZDix0mU2jGFfEot6hgUg34="; + cargoSha256 = "sha256-OQZPOiMTpoWabxHa3TJG8L3zq8WxMeFttw8xggSXsMA="; - nativeBuildInputs = lib.optional stdenv.isLinux python3; + nativeBuildInputs = lib.optionals stdenv.isLinux [ + pkg-config + ]; buildInputs = lib.optionals stdenv.isLinux [ - libGL + expat + fontconfig + freetype xorg.libX11 xorg.libXcursor xorg.libXi xorg.libXrandr - xorg.libxcb - libxkbcommon ] ++ lib.optionals stdenv.isDarwin [ AppKit - IOKit ]; postFixup = lib.optionalString stdenv.isLinux '' - patchelf --set-rpath ${lib.makeLibraryPath buildInputs} $out/bin/epick + patchelf $out/bin/epick --add-rpath ${lib.makeLibraryPath [ libGL ]} ''; meta = with lib; { diff --git a/pkgs/applications/graphics/eyedropper/default.nix b/pkgs/applications/graphics/eyedropper/default.nix index fdb56440ed13d..32098c977044f 100644 --- a/pkgs/applications/graphics/eyedropper/default.nix +++ b/pkgs/applications/graphics/eyedropper/default.nix @@ -15,19 +15,19 @@ stdenv.mkDerivation rec { pname = "eyedropper"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "FineFindus"; repo = pname; rev = version; - hash = "sha256-dOB274OA7h1vwCuapzivHnMLLw/NTzsmOfFtHHaca1I="; + hash = "sha256-bOpwHaFOoUlh+yyC1go6BeFxfJhUmwZPi6kYAqCagEI="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-ymRl/nIUuT1BXa1dF5CMemBI8aYrdqeoVtghm6NF8cs="; + hash = "sha256-TkdOq+icU2zNbXzN6nbkXjL1o/Lfumqr/5S0pQaxY5Q="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 018d6bf0b7b92..58fc646cce8d1 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "502a"; + version = "503"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - hash = "sha256-GmYjf2r5dyxkPWTmypChKbkeifCMFKi1lzRhPNe7Ckw="; + hash = "sha256-nJn5EphbmVYAAOisV3fym/nHlJl/aPZ2Iyp+Z2/N3Jc="; }; nativeBuildInputs = [ @@ -37,7 +37,6 @@ python3Packages.buildPythonPackage rec { opencv4 pillow psutil - pylzma pyopenssl pyside2 pysocks diff --git a/pkgs/applications/graphics/kcc/default.nix b/pkgs/applications/graphics/kcc/default.nix index bbbd4ed351bc2..2f481252d881d 100644 --- a/pkgs/applications/graphics/kcc/default.nix +++ b/pkgs/applications/graphics/kcc/default.nix @@ -23,7 +23,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { raven ]; - qtWrapperArgs = lib.optional archiveSupport [ "--prefix" "PATH" ":" "${ lib.makeBinPath [ p7zip ] }" ]; + qtWrapperArgs = lib.optionals archiveSupport [ "--prefix" "PATH" ":" "${ lib.makeBinPath [ p7zip ] }" ]; postFixup = '' wrapProgram $out/bin/kcc "''${qtWrapperArgs[@]}" diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/applications/graphics/xournalpp/default.nix index 5fd139b8de4a7..ce262d73be438 100644 --- a/pkgs/applications/graphics/xournalpp/default.nix +++ b/pkgs/applications/graphics/xournalpp/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "xournalpp"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "xournalpp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AzLkXGcTjtfBaPOZ/Tc+TwL63vm08G2tZw3pGzoo7po="; + sha256 = "sha256-E/7S4JGLXR8u9fE8bTVPFb6XVKOC/BHnQwLhr7N2A48="; }; nativeBuildInputs = [ cmake gettext pkg-config wrapGAppsHook ]; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional withLua lua; - buildFlags = "translations"; + buildFlags = [ "translations" ]; hardeningDisable = [ "format" ]; |