Merge pull request #305444 from atorres1985-contrib/clean-ryanbot
stormlib: 9.22 -> 9.23
This commit is contained in:
commit
3941255d59
|
@ -1,27 +0,0 @@
|
||||||
{ lib, stdenv, fetchurl, cmake, stormlib }:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
pname = "smpq";
|
|
||||||
version = "1.6";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "https://launchpad.net/smpq/trunk/${version}/+download/${pname}_${version}.orig.tar.gz";
|
|
||||||
sha256 = "1jqq5x3b17jy66x3kkf5hs5l322dx2v14djxxrqrnqp8bn5drlmm";
|
|
||||||
};
|
|
||||||
|
|
||||||
cmakeFlags = [
|
|
||||||
"-DWITH_KDE=OFF"
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
|
||||||
buildInputs = [ stormlib ];
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "StormLib MPQ archiving utility";
|
|
||||||
homepage = "https://launchpad.net/smpq";
|
|
||||||
license = licenses.gpl3Only;
|
|
||||||
platforms = platforms.all;
|
|
||||||
maintainers = with maintainers; [ aanderse karolchmist ];
|
|
||||||
mainProgram = "smpq";
|
|
||||||
};
|
|
||||||
}
|
|
36
pkgs/by-name/sm/smpq/package.nix
Normal file
36
pkgs/by-name/sm/smpq/package.nix
Normal file
|
@ -0,0 +1,36 @@
|
||||||
|
{
|
||||||
|
lib,
|
||||||
|
cmake,
|
||||||
|
fetchurl,
|
||||||
|
stdenv,
|
||||||
|
stormlib,
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
|
pname = "smpq";
|
||||||
|
version = "1.6";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://launchpad.net/smpq/trunk/${finalAttrs.version}/+download/smpq_${finalAttrs.version}.orig.tar.gz";
|
||||||
|
hash = "sha256-tdLcil3oYptx7l02ErboTYhBi4bFzTm6MV6esEYvGMs=";
|
||||||
|
};
|
||||||
|
|
||||||
|
cmakeFlags = [
|
||||||
|
(lib.cmakeBool "WITH_KDE" false)
|
||||||
|
];
|
||||||
|
|
||||||
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|
||||||
|
buildInputs = [ stormlib ];
|
||||||
|
|
||||||
|
strictDeps = true;
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
homepage = "https://launchpad.net/smpq";
|
||||||
|
description = "StormLib MPQ archiving utility";
|
||||||
|
license = lib.licenses.gpl3Only;
|
||||||
|
mainProgram = "smpq";
|
||||||
|
maintainers = with lib.maintainers; [ aanderse karolchmist ];
|
||||||
|
platforms = lib.platforms.all;
|
||||||
|
};
|
||||||
|
})
|
|
@ -1,41 +1,61 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, cmake, bzip2, libtomcrypt, zlib, darwin }:
|
{
|
||||||
|
lib,
|
||||||
|
bzip2,
|
||||||
|
cmake,
|
||||||
|
darwin,
|
||||||
|
fetchFromGitHub,
|
||||||
|
libtomcrypt,
|
||||||
|
stdenv,
|
||||||
|
zlib,
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "stormlib";
|
pname = "stormlib";
|
||||||
version = "9.22";
|
version = "9.23";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "ladislav-zezula";
|
owner = "ladislav-zezula";
|
||||||
repo = "StormLib";
|
repo = "StormLib";
|
||||||
rev = "v${version}";
|
rev = "v${finalAttrs.version}";
|
||||||
sha256 = "1rcdl6ryrr8fss5z5qlpl4prrw8xpbcdgajg2hpp0i7fpk21ymcc";
|
hash = "sha256-8JDMqZ5BWslH4+Mfo5lnWTmD2QDaColwBOLzcuGZciY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
nativeBuildInputs = [
|
||||||
substituteInPlace CMakeLists.txt \
|
cmake
|
||||||
--replace "FRAMEWORK DESTINATION /Library/Frameworks" "FRAMEWORK DESTINATION Library/Frameworks"
|
|
||||||
'';
|
|
||||||
|
|
||||||
cmakeFlags = [
|
|
||||||
"-DBUILD_SHARED_LIBS=ON"
|
|
||||||
"-DWITH_LIBTOMCRYPT=ON"
|
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
buildInputs = [
|
||||||
buildInputs = [ bzip2 libtomcrypt zlib ] ++
|
bzip2
|
||||||
lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Carbon ];
|
libtomcrypt
|
||||||
|
zlib
|
||||||
|
]
|
||||||
|
++ lib.optionals stdenv.isDarwin [
|
||||||
|
darwin.apple_sdk.frameworks.Carbon
|
||||||
|
];
|
||||||
|
|
||||||
|
cmakeFlags = [
|
||||||
|
(lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
|
||||||
|
(lib.cmakeBool "WITH_LIBTOMCRYPT" true)
|
||||||
|
];
|
||||||
|
|
||||||
|
strictDeps = true;
|
||||||
|
|
||||||
env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [
|
env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [
|
||||||
"-Wno-implicit-function-declaration"
|
"-Wno-implicit-function-declaration"
|
||||||
"-Wno-int-conversion"
|
"-Wno-int-conversion"
|
||||||
]);
|
]);
|
||||||
|
|
||||||
meta = with lib; {
|
postPatch = ''
|
||||||
|
substituteInPlace CMakeLists.txt \
|
||||||
|
--replace "FRAMEWORK DESTINATION /Library/Frameworks" "FRAMEWORK DESTINATION Library/Frameworks"
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = {
|
||||||
homepage = "https://github.com/ladislav-zezula/StormLib";
|
homepage = "https://github.com/ladislav-zezula/StormLib";
|
||||||
license = licenses.mit;
|
|
||||||
description = "An open-source project that can work with Blizzard MPQ archives";
|
description = "An open-source project that can work with Blizzard MPQ archives";
|
||||||
mainProgram = "storm_test";
|
license = lib.licenses.mit;
|
||||||
platforms = platforms.all;
|
maintainers = with lib.maintainers; [ aanderse karolchmist ];
|
||||||
maintainers = with maintainers; [ aanderse karolchmist ];
|
platforms = lib.platforms.all;
|
||||||
|
broken = stdenv.isDarwin; # installation directory mismatch
|
||||||
};
|
};
|
||||||
}
|
})
|
||||||
|
|
|
@ -13152,7 +13152,17 @@ with pkgs;
|
||||||
|
|
||||||
smug = callPackage ../tools/misc/smug { };
|
smug = callPackage ../tools/misc/smug { };
|
||||||
|
|
||||||
smpq = callPackage ../applications/misc/smpq { };
|
smpq = callPackage ../by-name/sm/smpq/package.nix {
|
||||||
|
stormlib = stormlib.overrideAttrs (old: {
|
||||||
|
version = "9.22";
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "ladislav-zezula";
|
||||||
|
repo = "StormLib";
|
||||||
|
rev = "v9.22";
|
||||||
|
hash = "sha256-jFUfxLzuRHAvFE+q19i6HfGcL6GX4vKL1g7l7LOhjeU=";
|
||||||
|
};
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
snabb = callPackage ../tools/networking/snabb { };
|
snabb = callPackage ../tools/networking/snabb { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user