From 7fe01a7279a8a9630ac42b2c7c9dd291c4a7a9a9 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 20 Jan 2016 00:43:52 +0300 Subject: [PATCH] phoebus-theme: update for 0.42.05, make a derivation Also specify license, see https://github.com/fricy/Phoebus/issues/5 --- pkgs/games/dwarf-fortress/default.nix | 2 + pkgs/games/dwarf-fortress/themes/phoebus.nix | 51 +++++++++----------- 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index 84b5f2b0f4b6..317b532ecbe6 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -22,6 +22,8 @@ let }; dwarf-therapist = callPackage ./dwarf-therapist/wrapper.nix { }; + + phoebus-theme = callPackage ./themes/phoebus.nix { }; }; in self diff --git a/pkgs/games/dwarf-fortress/themes/phoebus.nix b/pkgs/games/dwarf-fortress/themes/phoebus.nix index a26abf207d4f..2183a6245c0c 100644 --- a/pkgs/games/dwarf-fortress/themes/phoebus.nix +++ b/pkgs/games/dwarf-fortress/themes/phoebus.nix @@ -1,36 +1,33 @@ -{ dfBaseVersion -, dfPatchVersion -, fetchzip -, ... -}: +{ stdenv, fetchFromGitHub }: -let +# On upgrade check https://github.com/fricy/Phoebus/blob/master/manifest.json +# for compatibility information. - phoebusVersion = "00"; - phoebusFileName = "Phoebus_${dfBaseVersion}_${dfPatchVersion}v${phoebusVersion}"; +stdenv.mkDerivation { + name = "phoebus-theme-20160118"; -in rec { - - src = fetchzip { - name = phoebusFileName; - url = "http://dffd.bay12games.com/download.php?id=2430&f=${phoebusFileName}.zip"; - sha256 = "0fb68r6fd7v67mbh2439ygqrmdk4pw94gd293fqxb9qg71ilrb6s"; - stripRoot = false; + src = fetchFromGitHub { + owner = "fricy"; + repo = "Phoebus"; + rev = "2c5777b0f307b1d752a8a484c6a05b67531c84a9"; + sha256 = "0a5ixm181wz7crr3rpa2mh0drb371j5hvizqninvdnhah2mypz8v"; }; - sourceRoot = src.name; - installPhase = '' - pushd ../../$themeSourceRoot - - cp data/init/phoebus/* $out/share/df_linux/data/init/ - cp -rT raw $out/share/df_linux/raw - mkdir -p $out/share/df_linux/data/config - cp data/config/* $out/share/df_linux/data/config/ - cp data/art/* $out/share/df_linux/data/art/ - - popd + mkdir $out + cp -r data raw $out ''; -} + passthru.dfVersion = "0.42.05"; + preferLocalBuild = true; + + meta = with stdenv.lib; { + description = "Phoebus graphics set for Dwarf Fortress"; + homepage = "http://www.bay12forums.com/smf/index.php?topic=137096.0"; + platforms = platforms.all; + maintainers = with maintainers; [ a1russell abbradar ]; + # https://github.com/fricy/Phoebus/issues/5 + license = licenses.free; + }; +}