diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-10-20 22:09:03 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-10-20 22:09:03 +0000 |
commit | 50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e (patch) | |
tree | f2556b911180125ccbb7ed0e78a54e92da89adce /nixpkgs/pkgs/desktops/arcan/arcan/001-luajit.patch | |
parent | 4c16d4548a98563c9d9ad76f4e5b2202864ccd54 (diff) | |
parent | cfc75eec4603c06503ae750f88cf397e00796ea8 (diff) | |
download | nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.gz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.bz2 nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.lz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.xz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.zst nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.zip |
Merge commit 'cfc75eec4603c06503ae750f88cf397e00796ea8'
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/desktops/arcan/arcan/001-luajit.patch')
-rw-r--r-- | nixpkgs/pkgs/desktops/arcan/arcan/001-luajit.patch | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/nixpkgs/pkgs/desktops/arcan/arcan/001-luajit.patch b/nixpkgs/pkgs/desktops/arcan/arcan/001-luajit.patch deleted file mode 100644 index eff3c0a5aad0..000000000000 --- a/nixpkgs/pkgs/desktops/arcan/arcan/001-luajit.patch +++ /dev/null @@ -1,17 +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 -@@ -419,12 +415,7 @@ - set(LUA_TAG "luajit51") - if (EXISTS ${EXTERNAL_SRC_DIR}/git/luajit) - ExternalProject_Add(luajit -- SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/luajit -- GIT_REPOSITORY "${EXTERNAL_SRC_DIR}/git/luajit" -- CONFIGURE_COMMAND "" -- GIT_TAG "v2.1.0-beta3" -- UPDATE_COMMAND "" -- INSTALL_COMMAND "" -+ SOURCE_DIR "${EXTERNAL_SRC_DIR}/git/luajit" - BUILD_IN_SOURCE 1 - BUILD_COMMAND "${EXTMAKE_CMD}" - DEFAULT_CC=${CMAKE_C_COMPILER} |