diff options
| author | DwarfMaster <luc@dwarfmaster.net> | 2022-05-14 18:44:06 +0200 |
|---|---|---|
| committer | DwarfMaster <luc@dwarfmaster.net> | 2022-05-15 02:18:36 +0200 |
| commit | d7251c42aa66f39c584629681ea5bddc1584aa18 (patch) | |
| tree | 3c5d70fa73ff0b22fcfe8527cf800fb2248bc116 | |
| parent | ed3f3fb843c44cb370922ae3f181c6d86e7647cb (diff) | |
| download | nixpkgs-d7251c42aa66f39c584629681ea5bddc1584aa18.tar nixpkgs-d7251c42aa66f39c584629681ea5bddc1584aa18.tar.gz nixpkgs-d7251c42aa66f39c584629681ea5bddc1584aa18.tar.bz2 nixpkgs-d7251c42aa66f39c584629681ea5bddc1584aa18.tar.lz nixpkgs-d7251c42aa66f39c584629681ea5bddc1584aa18.tar.xz nixpkgs-d7251c42aa66f39c584629681ea5bddc1584aa18.tar.zst nixpkgs-d7251c42aa66f39c584629681ea5bddc1584aa18.zip | |
arcan.arcan: 0.6.1 -> 0.6.1.1
| -rw-r--r-- | pkgs/desktops/arcan/arcan/003-freetype.patch | 14 | ||||
| -rw-r--r-- | pkgs/desktops/arcan/arcan/default.nix | 5 |
2 files changed, 2 insertions, 17 deletions
diff --git a/pkgs/desktops/arcan/arcan/003-freetype.patch b/pkgs/desktops/arcan/arcan/003-freetype.patch deleted file mode 100644 index e38d329b026..00000000000 --- a/pkgs/desktops/arcan/arcan/003-freetype.patch +++ /dev/null @@ -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 diff --git a/pkgs/desktops/arcan/arcan/default.nix b/pkgs/desktops/arcan/arcan/default.nix index f3f4be2fcc4..a15d5ac6be9 100644 --- a/pkgs/desktops/arcan/arcan/default.nix +++ b/pkgs/desktops/arcan/arcan/default.nix @@ -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 |