diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-03-03 18:01:09 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-03 18:01:09 +0000 |
| commit | 3d632fe115d524781ca8dbba772afca2047ae287 (patch) | |
| tree | 3d700d7c1e8883584693c7c89c237d00ac44c62d /pkgs/applications/graphics | |
| parent | 0d466b7ac7d51fff3fd0c4f2d0eea6d58477cd81 (diff) | |
| parent | 51403ecd1909faa16fca0b5d37392f61ebcf231f (diff) | |
| download | nixlib-3d632fe115d524781ca8dbba772afca2047ae287.tar nixlib-3d632fe115d524781ca8dbba772afca2047ae287.tar.gz nixlib-3d632fe115d524781ca8dbba772afca2047ae287.tar.bz2 nixlib-3d632fe115d524781ca8dbba772afca2047ae287.tar.lz nixlib-3d632fe115d524781ca8dbba772afca2047ae287.tar.xz nixlib-3d632fe115d524781ca8dbba772afca2047ae287.tar.zst nixlib-3d632fe115d524781ca8dbba772afca2047ae287.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/openscad/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/applications/graphics/structorizer/default.nix | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 24d1fdc06ae8..e0ea00e5c298 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -29,6 +29,7 @@ , spacenavSupport ? stdenv.isLinux, libspnav , wayland , wayland-protocols +, wrapGAppsHook , qtwayland , cairo }: @@ -57,7 +58,7 @@ mkDerivation rec { }) ]; - nativeBuildInputs = [ bison flex pkg-config gettext qmake ]; + nativeBuildInputs = [ bison flex pkg-config gettext qmake wrapGAppsHook]; buildInputs = [ eigen boost glew opencsg cgal_4 mpfr gmp glib diff --git a/pkgs/applications/graphics/structorizer/default.nix b/pkgs/applications/graphics/structorizer/default.nix index ca3b17a3ed37..bb6d2660836a 100644 --- a/pkgs/applications/graphics/structorizer/default.nix +++ b/pkgs/applications/graphics/structorizer/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "structorizer"; - version = "3.32-15"; + version = "3.32-16"; desktopItems = [ (makeDesktopItem { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { owner = "fesch"; repo = "Structorizer.Desktop"; rev = version; - hash = "sha256-ZCVvMvbXMQIcZRk1F7QiRtNeuLicHe/aEvwp4FvhwoM="; + hash = "sha256-K/ofwwlkZF13V0IZEL166n58ylm+qdh1jbXzH7LwXog="; }; patches = [ ./makeStructorizer.patch ./makeBigJar.patch ]; |