diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/graphics')
6 files changed, 33 insertions, 14 deletions
diff --git a/nixpkgs/pkgs/applications/graphics/digikam/default.nix b/nixpkgs/pkgs/applications/graphics/digikam/default.nix index cc2b955fcc21..cf2376b3733d 100644 --- a/nixpkgs/pkgs/applications/graphics/digikam/default.nix +++ b/nixpkgs/pkgs/applications/graphics/digikam/default.nix @@ -8,6 +8,7 @@ , qtsvg , qtwebengine +, akonadi-contacts , kcalcore , kconfigwidgets , kcoreaddons @@ -50,14 +51,14 @@ }: mkDerivation rec { - name = "digikam-${version}"; - version = "6.0.0"; + pname = "digikam"; + version = "6.1.0"; src = fetchFromGitHub { owner = "KDE"; repo = "digikam"; rev = "v${version}"; - sha256 = "1ifvrn0bm7fp07d059rl4dy146qzdxafl36ipxg1fg00dkv95hh4"; + sha256 = "0h0jqfgpanhxfi3r7cgip58ppypqx79z6c5jj7i7f19hp2zziip8"; }; nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ]; @@ -88,6 +89,7 @@ mkDerivation rec { qtsvg qtwebengine + akonadi-contacts kcalcore kconfigwidgets kcoreaddons @@ -112,6 +114,7 @@ mkDerivation rec { preFixup = '' gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ gnumake hugin enblend-enfuse ]}) + gappsWrapperArgs+=(--suffix DK_PLUGIN_PATH : ${placeholder "out"}/${qtbase.qtPluginPrefix}/${pname}) substituteInPlace $out/bin/digitaglinktree \ --replace "/usr/bin/perl" "${perl}/bin/perl" \ --replace "/usr/bin/sqlite3" "${sqlite}/bin/sqlite3" diff --git a/nixpkgs/pkgs/applications/graphics/gimp/wrapper.nix b/nixpkgs/pkgs/applications/graphics/gimp/wrapper.nix index ec529519159b..11c1e9ada931 100644 --- a/nixpkgs/pkgs/applications/graphics/gimp/wrapper.nix +++ b/nixpkgs/pkgs/applications/graphics/gimp/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, symlinkJoin, gimp, makeWrapper, gimpPlugins, plugins ? null}: +{ stdenv, lib, symlinkJoin, gimp, makeWrapper, gimpPlugins, gnome3, plugins ? null}: let allPlugins = lib.filter (pkg: builtins.isAttrs pkg && pkg.type == "derivation" && !pkg.meta.broken or false) (lib.attrValues gimpPlugins); @@ -17,6 +17,7 @@ in symlinkJoin { for each in gimp-${versionBranch} gimp-console-${versionBranch}; do wrapProgram $out/bin/$each \ --set GIMP2_PLUGINDIR "$out/lib/gimp/2.0" \ + --prefix GTK_PATH : "${gnome3.gnome-themes-extra}/lib/gtk-2.0" \ ${toString extraArgs} done set +x diff --git a/nixpkgs/pkgs/applications/graphics/imgcat/default.nix b/nixpkgs/pkgs/applications/graphics/imgcat/default.nix index a98029dd5807..862d3a9dff5e 100644 --- a/nixpkgs/pkgs/applications/graphics/imgcat/default.nix +++ b/nixpkgs/pkgs/applications/graphics/imgcat/default.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { sha256 = "0m83c33rzxvs0w214njql2c7q3fg06wnyijch3l2s88i7frl121f"; }; + NIX_CFLAGS_COMPILE = "-Wno-error"; + meta = with stdenv.lib; { description = "It's like cat, but for images"; homepage = https://github.com/eddieantonio/imgcat; diff --git a/nixpkgs/pkgs/applications/graphics/ipe/default.nix b/nixpkgs/pkgs/applications/graphics/ipe/default.nix index 0673eec8c86f..d4a7e396cb05 100644 --- a/nixpkgs/pkgs/applications/graphics/ipe/default.nix +++ b/nixpkgs/pkgs/applications/graphics/ipe/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "ipe-7.2.11"; + name = "ipe-7.2.12"; src = fetchurl { url = "https://dl.bintray.com/otfried/generic/ipe/7.2/${name}-src.tar.gz"; - sha256 = "09d71fdpiz359mcnb57460w2mcfizvlnidd6g1k4c3v6rglwlbd2"; + sha256 = "1qw1cmwzi3wxk4x916i9y4prhi9brnwl14i9a1cbw23x1sr7i6kw"; }; sourceRoot = "${name}/src"; diff --git a/nixpkgs/pkgs/applications/graphics/openscad/default.nix b/nixpkgs/pkgs/applications/graphics/openscad/default.nix index bce2e8826983..5922206a8b9e 100644 --- a/nixpkgs/pkgs/applications/graphics/openscad/default.nix +++ b/nixpkgs/pkgs/applications/graphics/openscad/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, qt5, libsForQt5 , bison, flex, eigen, boost, libGLU_combined, glew, opencsg, cgal -, mpfr, gmp, glib, pkgconfig, harfbuzz, gettext +, mpfr, gmp, glib, pkgconfig, harfbuzz, gettext, freetype, fontconfig }: stdenv.mkDerivation rec { @@ -18,11 +18,13 @@ stdenv.mkDerivation rec { sha256 = "1y63yqyd0v255liik4ff5ak6mj86d8d76w436x76hs5dk6jgpmfb"; }; + nativeBuildInputs = [ bison flex pkgconfig ]; + buildInputs = [ - bison flex eigen boost libGLU_combined glew opencsg cgal mpfr gmp glib - pkgconfig harfbuzz gettext - ] - ++ (with qt5; [qtbase qmake]) + eigen boost glew opencsg cgal mpfr gmp glib + harfbuzz gettext freetype fontconfig + ] ++ stdenv.lib.optional stdenv.isLinux libGLU_combined + ++ (with qt5; [qtbase qmake] ++ stdenv.lib.optional stdenv.isDarwin qtmacextras) ++ (with libsForQt5; [qscintilla]) ; @@ -33,6 +35,17 @@ stdenv.mkDerivation rec { doCheck = false; + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + mkdir $out/Applications + mv $out/bin/*.app $out/Applications + rmdir $out/bin || true + + mv --target-directory=$out/Applications/OpenSCAD.app/Contents/Resources \ + $out/share/openscad/{examples,color-schemes,locale,libraries,fonts} + + rmdir $out/share/openscad + ''; + meta = { description = "3D parametric model compiler"; longDescription = '' @@ -48,7 +61,7 @@ stdenv.mkDerivation rec { ''; homepage = http://openscad.org/; license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ bjornfor raskin the-kenny ]; }; diff --git a/nixpkgs/pkgs/applications/graphics/renderdoc/default.nix b/nixpkgs/pkgs/applications/graphics/renderdoc/default.nix index 89828ff45d7c..3fd4521d7cd8 100644 --- a/nixpkgs/pkgs/applications/graphics/renderdoc/default.nix +++ b/nixpkgs/pkgs/applications/graphics/renderdoc/default.nix @@ -12,14 +12,14 @@ let }; in stdenv.mkDerivation rec { - version = "1.2"; + version = "1.4"; name = "renderdoc-${version}"; src = fetchFromGitHub { owner = "baldurk"; repo = "renderdoc"; rev = "v${version}"; - sha256 = "0s1q5d58x18yz3nf94pv5i1qd2hc0a4gdj4qkpcn8s6ms2x05pz4"; + sha256 = "1iann73r4yzkwnm13h4zqipqrp5i5cnkv27yyap0axz6h3npw94r"; }; buildInputs = [ |