cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #282663 from wegank/stormlib-refactor

Browse source 
stormlib: fix build on darwin, refactor
This commit is contained in:
Weijia Wang 2024-01-22 20:08:16 +01:00 committed by GitHub
commit f1e512235c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/misc/smpq/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, cmake, StormLib }:
{ lib, stdenv, fetchurl, cmake, stormlib }:
stdenv.mkDerivation rec {
pname = "smpq";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [ cmake ];
buildInputs = [ StormLib ];
buildInputs = [ stormlib ];
meta = with lib; {
description = "StormLib MPQ archiving utility";

7
pkgs/development/libraries/StormLib/default.nix → pkgs/by-name/st/stormlib/package.nix
View file

@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, cmake, bzip2, libtomcrypt, zlib, darwin }:
stdenv.mkDerivation rec {
pname = "StormLib";
pname = "stormlib";
version = "9.22";
src = fetchFromGitHub {
@ -25,6 +25,11 @@ stdenv.mkDerivation rec {
buildInputs = [ bzip2 libtomcrypt zlib ] ++
lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Carbon ];
env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [
"-Wno-implicit-function-declaration"
"-Wno-int-conversion"
]);
meta = with lib; {
homepage = "https://github.com/ladislav-zezula/StormLib";
license = licenses.mit;

1
pkgs/top-level/aliases.nix
View file

@ -1000,6 +1000,7 @@ mapAliases ({
ssm-agent = amazon-ssm-agent; # Added 2023-10-17
starboard-octant-plugin = throw "starboard-octant-plugin has been dropped due to needing octant which is archived"; # Added 2023-09-29
steam-run-native = steam-run; # added 2022-02-21
StormLib = stormlib; # Added 2024-01-21
sumneko-lua-language-server = lua-language-server; # Added 2023-02-07
supertux-editor = throw "'supertux-editor' has been removed, as it was broken and unmaintained"; # Added 2023-12-22
swift-im = throw "swift-im has been removed as it is unmaintained and depends on deprecated Python 2 / Qt WebKit"; # Added 2023-01-06

2
pkgs/top-level/all-packages.nix
View file

@ -25185,8 +25185,6 @@ with pkgs;
stegsolve = callPackage ../tools/graphics/stegsolve { };
StormLib = callPackage ../development/libraries/StormLib { };
stxxl = callPackage ../development/libraries/stxxl { };
sv-lang = callPackage ../applications/science/electronics/sv-lang { };