Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1c9af6e7c127
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c9bf6aebaa6e
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 1, 2020

  1. devilutionx: install required font file

    @dtzWill
    dtzWill committed Jan 1, 2020
    Copy the full SHA
    a133f8e View commit details

  2. devilutionx: 0.5.0 -> 1.0.0 

    https://github.com/diasurgical/devilutionX/releases/tag/1.0.0
    @dtzWill
    dtzWill committed Jan 1, 2020
    Copy the full SHA
    2f040f6 View commit details

Commits on Jan 2, 2020

  1. Merge pull request #76770 from dtzWill/update/devilutionx-1.0.0 

    devilutionx: 0.5.0 -> 1.0.0, install font file
    @danbst
    danbst authored Jan 2, 2020
    Copy the full SHA
    c9bf6ae View commit details
Showing with 10 additions and 5 deletions.
  1. +10 −5 pkgs/games/devilutionx/default.nix
15 changes: 10 additions & 5 deletions pkgs/games/devilutionx/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
{ stdenv, fetchFromGitHub, cmake, SDL2, SDL2_mixer, SDL2_ttf, libsodium, pkg-config }:
stdenv.mkDerivation rec {
version = "0.5.0";
version = "1.0.0";
pname = "devilutionx";

src = fetchFromGitHub {
owner = "diasurgical";
repo = "devilutionX";
rev = version;
sha256 = "010hxj129zmsynvizk89vm2y29dcxsfi585czh3f03wfr38rxa6b";
sha256 = "0lx903gchda4bgr71469yn63rx5ya6xv9j1azx18nrv3sskrphn4";
};

NIX_CFLAGS_COMPILE = "-I${SDL2_ttf}/include/SDL2";
NIX_CFLAGS_COMPILE = [
"-I${SDL2_ttf}/include/SDL2"
''-DTTF_FONT_PATH="${placeholder "out"}/share/fonts/truetype/CharisSILB.ttf"''
];

nativeBuildInputs = [ pkg-config cmake ];
buildInputs = [ libsodium SDL2 SDL2_mixer SDL2_ttf ];
@@ -22,8 +25,10 @@ stdenv.mkDerivation rec {
mkdir -p $out/Applications
mv devilutionx.app $out/Applications
'' else ''
mkdir -p $out/bin
cp devilutionx $out/bin
install -Dm755 -t $out/bin devilutionx
install -Dt $out/share/fonts/truetype ../Packaging/resources/CharisSILB.ttf
# TODO: icons and .desktop (see Packages/{debian,fedora}/*)
'') + ''
runHook postInstall