diff --git a/pkgs/by-name/ap/appimagekit/nix.patch b/pkgs/by-name/ap/appimagekit/nix.patch deleted file mode 100644 index f03922cb5ca4..000000000000 --- a/pkgs/by-name/ap/appimagekit/nix.patch +++ /dev/null @@ -1,82 +0,0 @@ -Submodule lib/libappimage contains modified content -diff --git a/lib/libappimage/cmake/dependencies.cmake b/lib/libappimage/cmake/dependencies.cmake -index 8d96484..c7b17a1 100644 ---- a/lib/libappimage/cmake/dependencies.cmake -+++ b/lib/libappimage/cmake/dependencies.cmake -@@ -91,9 +91,18 @@ if(NOT USE_SYSTEM_SQUASHFUSE) - INCLUDE_DIRS "" - ) - else() -- message(STATUS "Using system squashfuse") -+ message(STATUS "Using system squashfsfuse from ${SQUASHFUSE}") - -- import_pkgconfig_target(TARGET_NAME libsquashfuse PKGCONFIG_TARGET squashfuse) -+ add_library(libsquashfuse INTERFACE IMPORTED GLOBAL) -+ -+ set(squashfuse_INCLUDE_DIRS "${SQUASHFUSE}/include") -+ set(squashfuse_LIBRARIES "${SQUASHFUSE}/lib/libsquashfuse.a;${SQUASHFUSE}/lib/libsquashfuse_ll.a;${SQUASHFUSE}/lib/libfuseprivate.a") -+ -+ set_property( -+ TARGET libsquashfuse -+ PROPERTY INTERFACE_LINK_LIBRARIES ${squashfuse_LIBRARIES} -+ ) -+ include_directories(${squashfuse_INCLUDE_DIRS}) - endif() - - -diff --git a/src/appimagetool.c b/src/appimagetool.c -index 6b37419..23425e7 100644 ---- a/src/appimagetool.c -+++ b/src/appimagetool.c -@@ -38,7 +38,7 @@ - #include - - #include --#include "squashfuse.h" -+#include - - #include - #include -@@ -96,7 +96,7 @@ static void die(const char *msg) { - } - - /* Function that prints the contents of a squashfs file --* using libsquashfuse (#include "squashfuse.h") */ -+* using libsquashfuse (#include ) */ - int sfs_ls(char* image) { - sqfs_err err = SQFS_OK; - sqfs_traverse trv; -diff --git a/src/appimagetoolnoglib.c b/src/appimagetoolnoglib.c -index f900e76..ffa87f8 100644 ---- a/src/appimagetoolnoglib.c -+++ b/src/appimagetoolnoglib.c -@@ -3,7 +3,7 @@ - - #include - #include --#include "squashfuse.h" -+#include - - #include - #include -@@ -118,7 +118,7 @@ int is_regular_file(const char *path) - } - - /* Function that prints the contents of a squashfs file -- * using libsquashfuse (#include "squashfuse.h") */ -+ * using libsquashfuse (#include ) */ - int sfs_ls(char* image) { - sqfs_err err = SQFS_OK; - sqfs_traverse trv; -diff --git a/src/runtime.c b/src/runtime.c -index bada3af..70a642b 100644 ---- a/src/runtime.c -+++ b/src/runtime.c -@@ -29,7 +29,7 @@ - - #define _GNU_SOURCE - --#include "squashfuse.h" -+#include - #include - #include diff --git a/pkgs/by-name/ap/appimagekit/package.nix b/pkgs/by-name/ap/appimagekit/package.nix deleted file mode 100644 index 9f5b5d10bf96..000000000000 --- a/pkgs/by-name/ap/appimagekit/package.nix +++ /dev/null @@ -1,175 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - pkg-config, - cmake, - autoconf, - automake, - libtool, - makeWrapper, - wget, - xxd, - desktop-file-utils, - file, - gnupg, - glib, - zlib, - cairo, - openssl, - fuse, - xz, - squashfuse, - inotify-tools, - libarchive, - squashfsTools, - gtest, -}: - -let - - appimagekit_src = fetchFromGitHub { - owner = "AppImage"; - repo = "AppImageKit"; - rev = "8bbf694455d00f48d835f56afaa1dabcd9178ba6"; - hash = "sha256-pqg+joomC5CI9WdKP/h/XKPsruMgZEaIOjPLOqnNPZw="; - fetchSubmodules = true; - }; - - # squashfuse adapted to nix from cmake expression in "${appimagekit_src}/lib/libappimage/cmake/dependencies.cmake" - appimagekit_squashfuse = squashfuse.overrideAttrs rec { - pname = "squashfuse"; - version = "unstable-2016-10-09"; - - src = fetchFromGitHub { - owner = "vasi"; - repo = pname; - rev = "1f980303b89c779eabfd0a0fdd36d6a7a311bf92"; - sha256 = "sha256-BZd1+7sRYZHthULKk3RlgMIy4uCUei45GbSEiZxLPFM="; - }; - - patches = [ - "${appimagekit_src}/lib/libappimage/src/patches/squashfuse.patch" - "${appimagekit_src}/lib/libappimage/src/patches/squashfuse_dlopen.patch" - ]; - - postPatch = '' - cp -v ${appimagekit_src}/lib/libappimage/src/patches/squashfuse_dlopen.[hc] . - ''; - - # Workaround build failure on -fno-common toolchains: - # ld: libsquashfuse_ll.a(libfuseprivate_la-fuseprivate.o):(.bss+0x8): - # multiple definition of `have_libloaded'; runtime.4.o:(.bss.have_libloaded+0x0): first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - preConfigure = '' - sed -i "/PKG_CHECK_MODULES.*/,/,:./d" configure - sed -i "s/typedef off_t sqfs_off_t/typedef int64_t sqfs_off_t/g" common.h - ''; - - configureFlags = [ - "--disable-demo" - "--disable-high-level" - "--without-lzo" - "--without-lz4" - ]; - - postConfigure = '' - sed -i "s|XZ_LIBS = -llzma |XZ_LIBS = -Bstatic -llzma/|g" Makefile - ''; - - # only static libs and header files - installPhase = '' - mkdir -p $out/lib $out/include - cp -v ./.libs/*.a $out/lib - cp -v ./*.h $out/include - ''; - }; - -in -stdenv.mkDerivation rec { - pname = "appimagekit"; - version = "unstable-2020-12-31"; - - src = appimagekit_src; - - patches = [ ./nix.patch ]; - - postPatch = '' - patchShebangs src/embed-magic-bytes-in-file.sh - ''; - - nativeBuildInputs = [ - pkg-config - cmake - autoconf - automake - libtool - wget - xxd - desktop-file-utils - makeWrapper - ]; - - buildInputs = [ - glib - zlib - cairo - openssl - fuse - xz - inotify-tools - libarchive - squashfsTools - appimagekit_squashfuse - ]; - - preConfigure = '' - export HOME=$(pwd) - ''; - - cmakeFlags = [ - "-DUSE_SYSTEM_XZ=ON" - "-DUSE_SYSTEM_SQUASHFUSE=ON" - "-DSQUASHFUSE=${appimagekit_squashfuse}" - "-DUSE_SYSTEM_LIBARCHIVE=ON" - "-DUSE_SYSTEM_GTEST=ON" - "-DUSE_SYSTEM_MKSQUASHFS=ON" - "-DTOOLS_PREFIX=${stdenv.cc.targetPrefix}" - ]; - - postInstall = '' - mkdir -p $out/lib/appimagekit - cp "${squashfsTools}/bin/mksquashfs" "$out/lib/appimagekit/" - cp "${desktop-file-utils}/bin/desktop-file-validate" "$out/bin" - - wrapProgram "$out/bin/appimagetool" \ - --prefix PATH : "${ - lib.makeBinPath [ - file - gnupg - ] - }" \ - --unset SOURCE_DATE_EPOCH - ''; - - nativeCheckInputs = [ gtest ]; - - # for debugging - passthru = { - squashfuse = appimagekit_squashfuse; - }; - - meta = with lib; { - description = "Tool to package desktop applications as AppImages"; - longDescription = '' - AppImageKit is an implementation of the AppImage format that - provides tools such as appimagetool and appimaged for handling - AppImages. - ''; - license = licenses.mit; - maintainers = with maintainers; [ taeer ]; - homepage = src.meta.homepage; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7f6b7315e979..88249e9ca3d3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -290,6 +290,7 @@ mapAliases { apacheKafka_3_6 = throw "apacheKafka_2_8 through _3_6 have been removed from nixpkgs as outdated"; # Added 2024-11-27 antimicroX = throw "'antimicroX' has been renamed to/replaced by 'antimicrox'"; # Converted to throw 2024-10-17 apacheAnt = ant; # Added 2024-11-28 + appimagekit = throw "'appimagekit' has been removed as it was broken in nixpkgs and archived upstream"; # Added 2025-04-19 apple-sdk_10_12 = throw "apple-sdk_10_12 was removed as Nixpkgs no longer supports macOS 10.12; see the 25.05 release notes"; # Added 2024-10-27 apple-sdk_10_13 = throw "apple-sdk_10_13 was removed as Nixpkgs no longer supports macOS 10.13; see the 25.05 release notes"; # Added 2024-10-27 apple-sdk_10_14 = throw "apple-sdk_10_14 was removed as Nixpkgs no longer supprots macOS 10.14; see the 25.05 release notes"; # Added 2024-10-27