summary refs log tree commit diff
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@mailbox.org>2022-05-24 10:16:59 -0500
committerGitHub <noreply@github.com>2022-05-24 10:16:59 -0500
commit1daa1ede66c69d146407dc9379f6d40de4e51d0d (patch)
tree28b39bccc6fd41e242dea0600da9a51b3eb59afd
parent02fecc1cbfb972667738ba91e8dcb7f16b9a69a3 (diff)
parentcbbd0f77eae0702d02dbbf6f0d45ad34844c6c4a (diff)
downloadnixpkgs-1daa1ede66c69d146407dc9379f6d40de4e51d0d.tar
nixpkgs-1daa1ede66c69d146407dc9379f6d40de4e51d0d.tar.gz
nixpkgs-1daa1ede66c69d146407dc9379f6d40de4e51d0d.tar.bz2
nixpkgs-1daa1ede66c69d146407dc9379f6d40de4e51d0d.tar.lz
nixpkgs-1daa1ede66c69d146407dc9379f6d40de4e51d0d.tar.xz
nixpkgs-1daa1ede66c69d146407dc9379f6d40de4e51d0d.tar.zst
nixpkgs-1daa1ede66c69d146407dc9379f6d40de4e51d0d.zip
Merge pull request #174205 from dotlambda/cutemaze-1.3.1
cutemaze: 1.3.0 -> 1.3.1
-rw-r--r--pkgs/games/cutemaze/default.nix21
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 17 insertions, 6 deletions
diff --git a/pkgs/games/cutemaze/default.nix b/pkgs/games/cutemaze/default.nix
index 44c48af5c29..f33ad0c876e 100644
--- a/pkgs/games/cutemaze/default.nix
+++ b/pkgs/games/cutemaze/default.nix
@@ -1,15 +1,26 @@
-{ lib, stdenv, fetchurl, qmake, qttools, qtsvg, mkDerivation }:
+{ lib
+, stdenv
+, fetchurl
+, cmake
+, qttools
+, wrapQtAppsHook
+, qtsvg
+}:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "cutemaze";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchurl {
     url = "https://gottcode.org/cutemaze/${pname}-${version}-src.tar.bz2";
-    sha256 = "sha256-h7+H2E37ZVSnlPa6ID+lNEvFtU5PfdMSlBjqBumojoU=";
+    sha256 = "6944931cd39e9ef202c11483b7b2b7409a068c52fa5fd4419ff938b1158c72ab";
   };
 
-  nativeBuildInputs = [ qmake qttools ];
+  nativeBuildInputs = [
+    cmake
+    qttools
+    wrapQtAppsHook
+  ];
 
   buildInputs = [ qtsvg ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7e92d351193..5fbd7763edd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -31555,7 +31555,7 @@ with pkgs;
   curseofwar = callPackage ../games/curseofwar { SDL = null; };
   curseofwar-sdl = callPackage ../games/curseofwar { ncurses = null; };
 
-  cutemaze = libsForQt5.callPackage ../games/cutemaze { };
+  cutemaze = qt6Packages.callPackage ../games/cutemaze { };
 
   cuyo = callPackage ../games/cuyo { };