diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-08-23 10:09:14 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-08-26 09:07:03 +0000 |
commit | 63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f (patch) | |
tree | d58934cb48f9c953b19a0d0d5cffc0d0c5561471 /nixpkgs/pkgs/games/keeperrl/default.nix | |
parent | c4eef3dacb2a3d359561f30917d9e3cc4e041be9 (diff) | |
parent | 91a22f76cd1716f9d0149e8a5c68424bb691de15 (diff) | |
download | nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.gz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.bz2 nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.lz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.xz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.zst nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix
Diffstat (limited to 'nixpkgs/pkgs/games/keeperrl/default.nix')
-rw-r--r-- | nixpkgs/pkgs/games/keeperrl/default.nix | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/games/keeperrl/default.nix b/nixpkgs/pkgs/games/keeperrl/default.nix index 8fb6d563329b..c66ffdee920d 100644 --- a/nixpkgs/pkgs/games/keeperrl/default.nix +++ b/nixpkgs/pkgs/games/keeperrl/default.nix @@ -13,18 +13,18 @@ , libtheora , unfree_assets ? false }: -stdenv.mkDerivation rec { +let pname = "keeperrl"; version = "alpha34"; - free-src = fetchFromGitHub { + free_src = fetchFromGitHub { owner = "miki151"; - repo = "keeperrl"; + repo = pname; rev = version; sha256 = "sha256-0sww+ppctXvxMouclG3OdXpcNgrrOZJw9z8s2GhJ+IE="; }; - assets = if unfree_assets then requireFile rec { + assets = requireFile rec { name = "keeperrl_data_${version}.tar.gz"; message = '' This nix expression requires that the KeeperRL art assets are already @@ -39,11 +39,15 @@ stdenv.mkDerivation rec { "nix-prefetch-url file://\$PWD/${name}". ''; sha256 = "0115pxdzdyma2vicxgr0j21pp82gxdyrlj090s8ihp0b50f0nlll"; - } else null; + }; +in + +stdenv.mkDerivation { + inherit pname version; - sourceRoot = free-src.name; + srcs = [ free_src ] ++ lib.optional unfree_assets assets; - srcs = [ free-src ] ++ lib.optional unfree_assets assets; + sourceRoot = free_src.name; postUnpack = lib.optionalString unfree_assets '' mv data $sourceRoot |