diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-09-18 18:44:48 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-09-18 18:44:48 +0200 |
commit | de419917a3bd72c7b60632bd77eff1201c546050 (patch) | |
tree | 972321bd451a0aaffe30c78033ffb1f9fb9d7388 /pkgs/applications/graphics | |
parent | 1df2560dde3df459dd0e71883c5eac014100b0b0 (diff) | |
parent | 9064d9db001472e544536daf5ef7381ff4913d82 (diff) | |
download | nixlib-de419917a3bd72c7b60632bd77eff1201c546050.tar nixlib-de419917a3bd72c7b60632bd77eff1201c546050.tar.gz nixlib-de419917a3bd72c7b60632bd77eff1201c546050.tar.bz2 nixlib-de419917a3bd72c7b60632bd77eff1201c546050.tar.lz nixlib-de419917a3bd72c7b60632bd77eff1201c546050.tar.xz nixlib-de419917a3bd72c7b60632bd77eff1201c546050.tar.zst nixlib-de419917a3bd72c7b60632bd77eff1201c546050.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/gcolor3/default.nix | 27 | ||||
-rw-r--r-- | pkgs/applications/graphics/krita/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/graphics/qcomicbook/default.nix | 4 |
3 files changed, 12 insertions, 23 deletions
diff --git a/pkgs/applications/graphics/gcolor3/default.nix b/pkgs/applications/graphics/gcolor3/default.nix index cd43cd2fe723..ed350b2b0eee 100644 --- a/pkgs/applications/graphics/gcolor3/default.nix +++ b/pkgs/applications/graphics/gcolor3/default.nix @@ -1,29 +1,18 @@ -{ stdenv, fetchFromGitHub, fetchpatch, gnome3, meson, ninja, gettext, pkgconfig, libxml2, gtk3, hicolor-icon-theme, wrapGAppsHook }: +{ stdenv, fetchFromGitLab, gnome3, meson, ninja, gettext, pkgconfig, libxml2, gtk3, hicolor-icon-theme, wrapGAppsHook }: let - version = "2.3"; + version = "2.3.1"; in stdenv.mkDerivation { name = "gcolor3-${version}"; - src = fetchFromGitHub { - owner = "hjdskes"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World"; repo = "gcolor3"; rev = "v${version}"; - sha256 = "186j72kwsqdcakvdik9jl18gz3csdj53j3ylwagr9gfwmy0nmyjb"; + sha256 = "10cfzlkflwkb7f51rnrxmgxpfryh1qzvqaydj6lffjq9zvnhigg7"; }; - patches = [ - # Fix darwin build - (fetchpatch { - url = https://github.com/Hjdskes/gcolor3/commit/9130ffeff091fbafff6a0c8f06b09f54657d5dfd.patch; - sha256 = "1kn5hx536wivafb4awg7lsa8h32njy0lynmn7ci9y78dlp54057r"; - }) - (fetchpatch { - url = https://github.com/Hjdskes/gcolor3/commit/8d89081a8e13749f5a9051821114bc5fe814eaf3.patch; - sha256 = "1ldyr84dl2g6anqkp2mpxsrcr41fcqwi6ck14rfhai7rgrm8yar3"; - }) - ]; - nativeBuildInputs = [ meson ninja gettext pkgconfig libxml2 wrapGAppsHook ]; buildInputs = [ gtk3 hicolor-icon-theme ]; @@ -35,8 +24,8 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "A simple color chooser written in GTK3"; - homepage = https://hjdskes.github.io/projects/gcolor3/; - license = licenses.gpl2; + homepage = https://www.hjdskes.nl/projects/gcolor3/; + license = licenses.gpl2Plus; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index d4ac9720e15f..0abe90e0ba73 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -3,7 +3,7 @@ , kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem , kio, kcrash , boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib -, openjpeg, opencolorio, vc, poppler_qt5, curl, ilmbase +, openjpeg, opencolorio, vc, poppler, curl, ilmbase , qtmultimedia, qtx11extras , python3 }: @@ -23,7 +23,7 @@ mkDerivation rec { karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons ki18n kitemmodels kitemviews kwindowsystem kio kcrash boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib - openjpeg opencolorio poppler_qt5 curl ilmbase + openjpeg opencolorio poppler curl ilmbase qtmultimedia qtx11extras python3 ] ++ lib.optional (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) vc; diff --git a/pkgs/applications/graphics/qcomicbook/default.nix b/pkgs/applications/graphics/qcomicbook/default.nix index d67c8ef9b025..c37e21ec898a 100644 --- a/pkgs/applications/graphics/qcomicbook/default.nix +++ b/pkgs/applications/graphics/qcomicbook/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools, qtx11extras, poppler_qt5 }: +{ stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools, qtx11extras, poppler }: stdenv.mkDerivation rec { name = "qcomicbook-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - qtbase qttools qtx11extras poppler_qt5 + qtbase qttools qtx11extras poppler ]; postInstall = '' |