diff options
| -rw-r--r-- | pkgs/games/dwarf-fortress/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/games/dwarf-fortress/dwarf-therapist/default.nix | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index bc0b97b139b9..deb7f1709fb3 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -20,7 +20,7 @@ let }; }; - dwarf-therapist-original = callPackage ./dwarf-therapist { + dwarf-therapist-original = pkgs.qt5.callPackage ./dwarf-therapist { texlive = pkgs.texlive.combine { inherit (pkgs.texlive) scheme-basic float caption wrapfig adjmulticol sidecap preprint enumitem; }; diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix index 07714168e0e8..9f0d5196b6d9 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, coreutils, qt4, texlive }: +{ stdenv, fetchFromGitHub, coreutils, qtbase, qtdeclarative, texlive }: let - version = "36.0.0"; + version = "37.0.0"; in stdenv.mkDerivation { name = "dwarf-therapist-original-${version}"; @@ -10,11 +10,11 @@ stdenv.mkDerivation { owner = "splintermind"; repo = "Dwarf-Therapist"; rev = "v${version}"; - sha256 = "08xjawb25sibkkfqwd4mlq73dgmgc6lxbbd673rx7yhrsjh4z4h3"; + sha256 = "0dw86b4x5hjhb7h4ynvwjgcinpqywfc5l48ljb5sahz08rfnx63d"; }; outputs = [ "out" "layouts" ]; - buildInputs = [ qt4 ]; + buildInputs = [ qtbase qtdeclarative ]; nativeBuildInputs = [ texlive ]; enableParallelBuilding = false; @@ -35,6 +35,6 @@ stdenv.mkDerivation { maintainers = with stdenv.lib.maintainers; [ the-kenny abbradar ]; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; - homepage = https://code.google.com/r/splintermind-attributes/; + homepage = "https://github.com/splintermind/Dwarf-Therapist"; }; } |