b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

treewide: noop: misc cleanups

Browse source
This commit is contained in:
Jan Malakhovski 2023-08-08 17:18:26 +00:00 committed by Anderson Torres
parent 591ccfe5b9
commit 0e38454027
4 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/libraries/clipper/default.nix
View file

@ -10,8 +10,6 @@ stdenv.mkDerivation rec {
sourceRoot = "cpp"; sourceRoot = "cpp";
buildInputs = [ ];
nativeBuildInputs = [ cmake ninja unzip ]; nativeBuildInputs = [ cmake ninja unzip ];
meta = with lib; { meta = with lib; {

10
pkgs/development/libraries/getdns/default.nix
View file

@ -16,13 +16,9 @@ in rec {
outputs = [ "out" "dev" "lib" "man" ]; outputs = [ "out" "dev" "lib" "man" ];
src = fetchurl { src = fetchurl {
url = "https://getdnsapi.net/releases/${pname}-${ url = with lib; "https://getdnsapi.net/releases/${pname}-${concatStringsSep "-" (splitVersion version)}/${pname}-${version}.tar.gz";
with builtins; # upstream publishes hashes in hex format
concatStringsSep "-" (splitVersion version) sha256 = "f1404ca250f02e37a118aa00cf0ec2cbe11896e060c6d369c6761baea7d55a2c";
}/${pname}-${version}.tar.gz";
sha256 =
# upstream publishes hashes in hex format
"f1404ca250f02e37a118aa00cf0ec2cbe11896e060c6d369c6761baea7d55a2c";
}; };
nativeBuildInputs = [ cmake doxygen ]; nativeBuildInputs = [ cmake doxygen ];

3
pkgs/development/libraries/minizip/default.nix
View file

@ -2,8 +2,7 @@
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "minizip"; pname = "minizip";
version = zlib.version; inherit (zlib) src version;
inherit (zlib) src;
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ zlib ]; buildInputs = [ zlib ];

17
pkgs/games/keeperrl/default.nix
View file

@ -13,18 +13,18 @@
, libtheora , libtheora
, unfree_assets ? false }: , unfree_assets ? false }:
stdenv.mkDerivation rec { let
pname = "keeperrl"; pname = "keeperrl";
version = "alpha34"; version = "alpha34";
free-src = fetchFromGitHub { free-src = fetchFromGitHub {
owner = "miki151"; owner = "miki151";
repo = "keeperrl"; repo = pname;
rev = version; rev = version;
sha256 = "sha256-0sww+ppctXvxMouclG3OdXpcNgrrOZJw9z8s2GhJ+IE="; sha256 = "sha256-0sww+ppctXvxMouclG3OdXpcNgrrOZJw9z8s2GhJ+IE=";
}; };
assets = if unfree_assets then requireFile rec { assets = requireFile rec {
name = "keeperrl_data_${version}.tar.gz"; name = "keeperrl_data_${version}.tar.gz";
message = '' message = ''
This nix expression requires that the KeeperRL art assets are already This nix expression requires that the KeeperRL art assets are already
@ -39,11 +39,18 @@ stdenv.mkDerivation rec {
"nix-prefetch-url file://\$PWD/${name}". "nix-prefetch-url file://\$PWD/${name}".
''; '';
sha256 = "0115pxdzdyma2vicxgr0j21pp82gxdyrlj090s8ihp0b50f0nlll"; sha256 = "0115pxdzdyma2vicxgr0j21pp82gxdyrlj090s8ihp0b50f0nlll";
} else null; };
in
stdenv.mkDerivation {
inherit pname version;
srcs = [ free-src ] ++ lib.optional unfree_assets assets;
sourceRoot = free-src.name; 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 '' postUnpack = lib.optionalString unfree_assets ''
mv data $sourceRoot mv data $sourceRoot