public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

extra-cmake-modules: fixup patch

Browse Source
This commit is contained in:
Will Dietz 2019-09-15 18:39:06 -05:00
parent 51b2eaf331
commit a280f3a0f3
No known key found for this signature in database
GPG Key ID: EBB0EA4124809D02
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch
View File

@ -1,8 +1,8 @@
diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
index 275fd65..a04596c 100644 index 0acd33f..c04b0a5 100644
--- a/kde-modules/KDEInstallDirs.cmake --- a/kde-modules/KDEInstallDirs.cmake
+++ b/kde-modules/KDEInstallDirs.cmake +++ b/kde-modules/KDEInstallDirs.cmake
@@ -232,34 +232,6 @@ @@ -236,35 +236,6 @@
# GNUInstallDirs code deals with re-configuring, but that is dealt with # GNUInstallDirs code deals with re-configuring, but that is dealt with
# by the _define_* macros in this module). # by the _define_* macros in this module).
set(_LIBDIR_DEFAULT "lib") set(_LIBDIR_DEFAULT "lib")
@ -17,6 +17,7 @@ index 275fd65..a04596c 100644
-# See https://wiki.debian.org/Multiarch -# See https://wiki.debian.org/Multiarch
-if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU") -if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU")
- AND NOT CMAKE_CROSSCOMPILING - AND NOT CMAKE_CROSSCOMPILING
- AND NOT EXISTS "/etc/arch-release"
- AND NOT DEFINED ENV{FLATPAK_ID}) - AND NOT DEFINED ENV{FLATPAK_ID})
- if (EXISTS "/etc/debian_version") # is this a debian system ? - if (EXISTS "/etc/debian_version") # is this a debian system ?
- if(CMAKE_LIBRARY_ARCHITECTURE) - if(CMAKE_LIBRARY_ARCHITECTURE)