pyrox.dev / nixpkgs
lol
fork atom

extra-cmake-modules: drop merged patch

K900 37228188 39f75847

-41
unified split
-1
pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix
··· 4 pname = "extra-cmake-modules"; 5 6 patches = [ 7 - ./nix-lib-path.patch 8 # https://invent.kde.org/frameworks/extra-cmake-modules/-/merge_requests/268 9 (fetchpatch { 10 url = "https://invent.kde.org/frameworks/extra-cmake-modules/-/commit/5862a6f5b5cd7ed5a7ce2af01e44747c36318220.patch";
··· 4 pname = "extra-cmake-modules"; 5 6 patches = [ 7 # https://invent.kde.org/frameworks/extra-cmake-modules/-/merge_requests/268 8 (fetchpatch { 9 url = "https://invent.kde.org/frameworks/extra-cmake-modules/-/commit/5862a6f5b5cd7ed5a7ce2af01e44747c36318220.patch";
-40
pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch
··· 1 - diff --git a/kde-modules/KDEInstallDirsCommon.cmake b/kde-modules/KDEInstallDirsCommon.cmake 2 - index c1d056b..d9e19f0 100644 3 - --- a/kde-modules/KDEInstallDirsCommon.cmake 4 - +++ b/kde-modules/KDEInstallDirsCommon.cmake 5 - @@ -15,35 +15,6 @@ 6 - # GNUInstallDirs code deals with re-configuring, but that is dealt with 7 - # by the _define_* macros in this module). 8 - set(_LIBDIR_DEFAULT "lib") 9 - -# Override this default 'lib' with 'lib64' if: 10 - -# - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling 11 - -# - we are NOT on debian 12 - -# - we are NOT on flatpak 13 - -# - we are on a 64 bits system 14 - -# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf 15 - -# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if 16 - -# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu" 17 - -# See https://wiki.debian.org/Multiarch 18 - -if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU") 19 - - AND NOT CMAKE_CROSSCOMPILING 20 - - AND NOT EXISTS "/etc/arch-release" 21 - - AND NOT DEFINED ENV{FLATPAK_ID}) 22 - - if (EXISTS "/etc/debian_version") # is this a debian system ? 23 - - if(CMAKE_LIBRARY_ARCHITECTURE) 24 - - set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}") 25 - - endif() 26 - - else() # not debian, rely on CMAKE_SIZEOF_VOID_P: 27 - - if(NOT DEFINED CMAKE_SIZEOF_VOID_P) 28 - - message(AUTHOR_WARNING 29 - - "Unable to determine default LIB_INSTALL_LIBDIR directory because no target architecture is known. " 30 - - "Please enable at least one language before including KDEInstallDirs.") 31 - - else() 32 - - if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") 33 - - set(_LIBDIR_DEFAULT "lib64") 34 - - endif() 35 - - endif() 36 - - endif() 37 - -endif() 38 - 39 - set(_gnu_install_dirs_vars 40 - BINDIR
···