treewide: noop: misc cleanups
This commit is contained in:
parent
591ccfe5b9
commit
0e38454027
4 changed files with 16 additions and 16 deletions
|
@ -10,8 +10,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
sourceRoot = "cpp";
|
||||
|
||||
buildInputs = [ ];
|
||||
|
||||
nativeBuildInputs = [ cmake ninja unzip ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -16,13 +16,9 @@ in rec {
|
|||
outputs = [ "out" "dev" "lib" "man" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://getdnsapi.net/releases/${pname}-${
|
||||
with builtins;
|
||||
concatStringsSep "-" (splitVersion version)
|
||||
}/${pname}-${version}.tar.gz";
|
||||
sha256 =
|
||||
# upstream publishes hashes in hex format
|
||||
"f1404ca250f02e37a118aa00cf0ec2cbe11896e060c6d369c6761baea7d55a2c";
|
||||
url = with lib; "https://getdnsapi.net/releases/${pname}-${concatStringsSep "-" (splitVersion version)}/${pname}-${version}.tar.gz";
|
||||
# upstream publishes hashes in hex format
|
||||
sha256 = "f1404ca250f02e37a118aa00cf0ec2cbe11896e060c6d369c6761baea7d55a2c";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake doxygen ];
|
||||
|
|
|
@ -2,8 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = "minizip";
|
||||
version = zlib.version;
|
||||
inherit (zlib) src;
|
||||
inherit (zlib) src version;
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
buildInputs = [ zlib ];
|
||||
|
|
|
@ -13,18 +13,18 @@
|
|||
, libtheora
|
||||
, unfree_assets ? false }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
let
|
||||
pname = "keeperrl";
|
||||
version = "alpha34";
|
||||
|
||||
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,18 @@ stdenv.mkDerivation rec {
|
|||
"nix-prefetch-url file://\$PWD/${name}".
|
||||
'';
|
||||
sha256 = "0115pxdzdyma2vicxgr0j21pp82gxdyrlj090s8ihp0b50f0nlll";
|
||||
} else null;
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
srcs = [ free-src ] ++ lib.optional unfree_assets assets;
|
||||
|
||||
sourceRoot = free-src.name;
|
||||
|
||||
srcs = [ free-src ] ++ lib.optional unfree_assets assets;
|
||||
inherit free-src;
|
||||
assets = if unfree_assets then assets else null;
|
||||
|
||||
postUnpack = lib.optionalString unfree_assets ''
|
||||
mv data $sourceRoot
|
||||
|
|
Loading…
Reference in a new issue