tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
quickbms: fix build
Yongun Seong
2 years ago
3c779c3f
6f6f750d
+32
-2
2 changed files
expand all
collapse all
unified
split
pkgs
tools
archivers
quickbms
0002-disable-openssl.patch
default.nix
+10
pkgs/tools/archivers/quickbms/0002-disable-openssl.patch
···
1
1
+
--- src/Makefile 2023-05-25 18:16:56.000296653 +0900
2
2
+
+++ src/Makefile 2023-05-25 18:17:00.772272861 +0900
3
3
+
@@ -23,7 +23,6 @@
4
4
+
EXTRA_TARGETS = libs/amiga/amiga.s libs/powzix/*.cpp
5
5
+
CFLAGS += -msse2
6
6
+
endif
7
7
+
-USE_OPENSSL = 1
8
8
+
endif
9
9
+
10
10
+
# -liconv and -fPIC are necessary on Android
+22
-2
pkgs/tools/archivers/quickbms/default.nix
···
1
1
-
{ stdenv, lib, fetchzip, bzip2, lzo, openssl, zlib }:
1
1
+
{ stdenv
2
2
+
, lib
3
3
+
, fetchzip
4
4
+
, fetchpatch
5
5
+
, bzip2
6
6
+
, lzo
7
7
+
, openssl_1_1
8
8
+
, opensslSupport ? false
9
9
+
, zlib
10
10
+
}:
2
11
3
12
stdenv.mkDerivation rec {
4
13
version = "0.11.0";
···
9
18
hash = "sha256-uQKTE36pLO8uhrX794utqaDGUeyqRz6zLCQFA7DYkNc=";
10
19
};
11
20
12
12
-
buildInputs = [ bzip2 lzo openssl zlib ];
21
21
+
patches = [
22
22
+
# Fix errors on x86_64 and _rotl definition
23
23
+
(fetchpatch {
24
24
+
name = "0001-fix-compile.patch";
25
25
+
url = "https://aur.archlinux.org/cgit/aur.git/plain/fix-compile.patch?h=quickbms&id=a2e3e4638295d7cfe39513bfef9447fb23154a6b";
26
26
+
hash = "sha256-49fT/L4BNzMYnq1SXhFMgSDLybLkz6KSbgKmUpZZu08=";
27
27
+
stripLen = 1;
28
28
+
})
29
29
+
] ++ lib.optional (!opensslSupport) ./0002-disable-openssl.patch;
30
30
+
31
31
+
buildInputs = [ bzip2 lzo zlib ]
32
32
+
++ lib.optional (opensslSupport) openssl_1_1;
13
33
14
34
makeFlags = [ "PREFIX=$(out)" ];
15
35