diff --git a/pkgs/applications/misc/smpq/default.nix b/pkgs/applications/misc/smpq/default.nix index fd6b5937b8e5..7a6264d96547 100644 --- a/pkgs/applications/misc/smpq/default.nix +++ b/pkgs/applications/misc/smpq/default.nix @@ -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"; diff --git a/pkgs/development/libraries/StormLib/default.nix b/pkgs/by-name/st/stormlib/package.nix similarity index 85% rename from pkgs/development/libraries/StormLib/default.nix rename to pkgs/by-name/st/stormlib/package.nix index bc247e956235..d55b93ca48ca 100644 --- a/pkgs/development/libraries/StormLib/default.nix +++ b/pkgs/by-name/st/stormlib/package.nix @@ -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; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ed5f2afd2372..d9063b2e0bb3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c1a25cbaee2c..fb4d11cb9d1a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };