mirror of
https://codeberg.org/spire/nix.git
synced 2026-08-02 12:25:00 +02:00
fix sourcemod building
This commit is contained in:
parent
729767748f
commit
5ac6c298d1
2 changed files with 13 additions and 13 deletions
|
|
@ -14,17 +14,17 @@
|
||||||
paths = attrValues sdks;
|
paths = attrValues sdks;
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
multiStdenv.mkDerivation rec {
|
multiStdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "metamod-source";
|
pname = "metamod-source";
|
||||||
version = "1.12";
|
version = "1.12.0.1224";
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE = "-Wno-error=format-truncation -Wno-error=ignored-attributes -Wno-error=template-id-cdtor";
|
NIX_CFLAGS_COMPILE = "-Wno-error=format-truncation -Wno-error=ignored-attributes -Wno-error=template-id-cdtor";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "alliedmodders";
|
owner = "alliedmodders";
|
||||||
repo = pname;
|
repo = finalAttrs.pname;
|
||||||
rev = "02ee4a312525d17b2f6d2f21a953d06";
|
rev = finalAttrs.version;
|
||||||
sha256 = "sha256-Q+MDJsB6bDWos04gkzr2QY8Bn+vDmHM0ljQy80FlKzM=";
|
sha256 = "sha256-zH1ww22D0Ksthl7aTVbegrO/dnLCyV7mz1CQ9SeyOBY=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -54,4 +54,4 @@ in
|
||||||
mv package $out/share
|
mv package $out/share
|
||||||
cp -r $src $out/include
|
cp -r $src $out/include
|
||||||
'';
|
'';
|
||||||
}
|
})
|
||||||
|
|
|
||||||
|
|
@ -24,20 +24,20 @@
|
||||||
# ambuild doesn't allow configuring a target prefix for "ar"
|
# ambuild doesn't allow configuring a target prefix for "ar"
|
||||||
arWrapper = writeShellScriptBin "ar" "exec -a $0 ${stdenv.cc.targetPrefix}ar $@";
|
arWrapper = writeShellScriptBin "ar" "exec -a $0 ${stdenv.cc.targetPrefix}ar $@";
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "sourcemod";
|
pname = "sourcemod";
|
||||||
version = "1.12";
|
version = "1.12.0.7239";
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE =
|
NIX_CFLAGS_COMPILE =
|
||||||
"-Wno-error=format-truncation -Wno-error=ignored-attributes -Wno-error=reorder -Wno-error=sign-compare "
|
"-Wno-error -Wno-error=format-truncation -Wno-error=ignored-attributes -Wno-error=reorder -Wno-error=sign-compare "
|
||||||
+ "-Wno-error=stringop-truncation -Wno-error=dangling-pointer -Wno-error=template-id-cdtor -Wno-error=format-security "
|
+ "-Wno-error=stringop-truncation -Wno-error=dangling-pointer -Wno-error=template-id-cdtor -Wno-error=format-security "
|
||||||
+ "-Wno-error=deprecated-declarations -Wno-error=stringop-overread";
|
+ "-Wno-error=deprecated-declarations -Wno-error=stringop-overread";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "alliedmodders";
|
owner = "alliedmodders";
|
||||||
repo = pname;
|
repo = finalAttrs.pname;
|
||||||
rev = "5c407d494889dd1b6b2187bbc31ac82";
|
rev = "b951843d42f7b9204615c14885468ea131a24002";
|
||||||
sha256 = "sha256-e9qlBMHCMbG1F+yacO4p4+nm32wfBoVPsIqwR79agWw=";
|
sha256 = "sha256-aulM6fzXcmQf0xztWDRyxbH02mTGJKPMqpUMUSeNbaM=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -66,4 +66,4 @@ in
|
||||||
mkdir $out
|
mkdir $out
|
||||||
mv package $out/share
|
mv package $out/share
|
||||||
'';
|
'';
|
||||||
}
|
})
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue