diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-12-31 12:00:36 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-12-31 12:00:36 +0100 |
| commit | 070290bda7972072a531c7e79a29bd005ebb84df (patch) | |
| tree | 572922a35ba554a97ff4771875f3a265fb8ce0e1 /pkgs/applications/graphics | |
| parent | ec1f78d1cb6ac86743ffb797bf88d4633b91e733 (diff) | |
| parent | 42575040fc64c1f5560c1cd1d1fdf0fd5e5d4b49 (diff) | |
| download | nixlib-070290bda7972072a531c7e79a29bd005ebb84df.tar nixlib-070290bda7972072a531c7e79a29bd005ebb84df.tar.gz nixlib-070290bda7972072a531c7e79a29bd005ebb84df.tar.bz2 nixlib-070290bda7972072a531c7e79a29bd005ebb84df.tar.lz nixlib-070290bda7972072a531c7e79a29bd005ebb84df.tar.xz nixlib-070290bda7972072a531c7e79a29bd005ebb84df.tar.zst nixlib-070290bda7972072a531c7e79a29bd005ebb84df.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/digikam/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/applications/graphics/k3d/default.nix | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index fb99d3e38322..e7621414b06f 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -6,7 +6,7 @@ , qtbase , qtxmlpatterns , qtsvg -, qtwebkit +, qtwebengine , kcalcore , kconfigwidgets @@ -84,7 +84,7 @@ mkDerivation rec { qtbase qtxmlpatterns qtsvg - qtwebkit + qtwebengine kcalcore kconfigwidgets @@ -105,6 +105,7 @@ mkDerivation rec { "-DENABLE_MYSQLSUPPORT=1" "-DENABLE_INTERNALMYSQL=1" "-DENABLE_MEDIAPLAYER=1" + "-DENABLE_QWEBENGINE=on" ]; preFixup = '' diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix index a4b509704a7f..301dc902dce9 100644 --- a/pkgs/applications/graphics/k3d/default.nix +++ b/pkgs/applications/graphics/k3d/default.nix @@ -39,6 +39,10 @@ stdenv.mkDerivation rec { #doCheck = false; + NIX_CFLAGS_COMPILE = [ + "-Wno-deprecated-declarations" + ]; + meta = with stdenv.lib; { description = "A 3D editor with support for procedural editing"; homepage = http://www.k-3d.org/; |