ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-17 06:06:13 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #173056 from dwarfmaster/arcan.arcan

Browse Source 
arcan.arcan: 0.6.1 -> 0.6.1.1
This commit is contained in:
Anderson Torres 2022-05-14 22:24:43 -03:00 committed by GitHub
commit 1d370bd073
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/desktops/arcan/arcan/003-freetype.patch
View File

@ -1,14 +0,0 @@
diff -Naur source-old/src/CMakeLists.txt source-new/src/CMakeLists.txt
--- source-old/src/CMakeLists.txt 1969-12-31 21:00:01.000000000 -0300
+++ source-new/src/CMakeLists.txt 2021-10-29 12:03:06.461399341 -0300
@@ -317,9 +317,7 @@
find_package(BZip2 REQUIRED QUIET)
pkg_check_modules(HARFBUZZ REQUIRED QUIET harfbuzz)
ExternalProject_Add(Freetype
- SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/freetype"
- UPDATE_COMMAND ""
- GIT_REPOSITORY "${EXTERNAL_SRC_DIR}/git/freetype"
+ SOURCE_DIR "${EXTERNAL_SRC_DIR}/git/freetype"
${EXTERNAL_DEFS}
${CMAKE_EXTERNAL_DEFS}
-DWITH_ZLIB=OFF

5
pkgs/desktops/arcan/arcan/default.nix
View File

@ -48,13 +48,13 @@
stdenv.mkDerivation rec {
pname = "arcan" + lib.optionalString useStaticOpenAL "-static-openal";
version = "0.6.1";
version = "0.6.1.1";
src = fetchFromGitHub {
owner = "letoram";
repo = "arcan";
rev = version;
hash = "sha256-2do4+6KB0AAcJk22mN0IA/e/bPaeGipLjI4RSTPqLBg=";
hash = "sha256-+dJaBSKGbHOwzA26/jDyh2UF9YRwGUcysJIeAM4kvfc=";
};
nativeBuildInputs = [
@ -106,7 +106,6 @@ stdenv.mkDerivation rec {
./000-openal.patch
./001-luajit.patch
./002-libuvc.patch
./003-freetype.patch
];
# Emulate external/git/clone.sh