public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dwarf-fortress-packages.dwarf-therapist: 36.0.0 -> 37.0.0

Browse Source
This commit is contained in:
Nikolay Amiantov 2016-03-03 15:02:21 +03:00
parent 9ec2fda2c2
commit 414dbc6dd9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/games/dwarf-fortress/default.nix
View File

@ -20,7 +20,7 @@ let
}; };
}; };
dwarf-therapist-original = callPackage ./dwarf-therapist { dwarf-therapist-original = pkgs.qt5.callPackage ./dwarf-therapist {
texlive = pkgs.texlive.combine { texlive = pkgs.texlive.combine {
inherit (pkgs.texlive) scheme-basic float caption wrapfig adjmulticol sidecap preprint enumitem; inherit (pkgs.texlive) scheme-basic float caption wrapfig adjmulticol sidecap preprint enumitem;
}; };

10
pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, coreutils, qt4, texlive }: { stdenv, fetchFromGitHub, coreutils, qtbase, qtdeclarative, texlive }:
let let
version = "36.0.0"; version = "37.0.0";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "dwarf-therapist-original-${version}"; name = "dwarf-therapist-original-${version}";
@ -10,11 +10,11 @@ stdenv.mkDerivation {
owner = "splintermind"; owner = "splintermind";
repo = "Dwarf-Therapist"; repo = "Dwarf-Therapist";
rev = "v${version}"; rev = "v${version}";
sha256 = "08xjawb25sibkkfqwd4mlq73dgmgc6lxbbd673rx7yhrsjh4z4h3"; sha256 = "0dw86b4x5hjhb7h4ynvwjgcinpqywfc5l48ljb5sahz08rfnx63d";
}; };
outputs = [ "out" "layouts" ]; outputs = [ "out" "layouts" ];
buildInputs = [ qt4 ]; buildInputs = [ qtbase qtdeclarative ];
nativeBuildInputs = [ texlive ]; nativeBuildInputs = [ texlive ];
enableParallelBuilding = false; enableParallelBuilding = false;
@ -35,6 +35,6 @@ stdenv.mkDerivation {
maintainers = with stdenv.lib.maintainers; [ the-kenny abbradar ]; maintainers = with stdenv.lib.maintainers; [ the-kenny abbradar ];
license = stdenv.lib.licenses.mit; license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
homepage = https://code.google.com/r/splintermind-attributes/; homepage = "https://github.com/splintermind/Dwarf-Therapist";
}; };
} }