diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-04-22 21:15:06 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-04-22 21:18:23 +0000 |
| commit | b935ae5f3cfb2bb4f9a3746d284f156a6dece505 (patch) | |
| tree | 5efe4e2e7a7723a737d0130a333b057c5e76df40 /nixpkgs/pkgs/development/libraries/kde-frameworks/extra-cmake-modules | |
| parent | dc9566e91c9453378c24e98b5737234364670df5 (diff) | |
| parent | d26027792812fbfad4d0f451b5f47fdabf7fdeb9 (diff) | |
| download | nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.tar nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.tar.gz nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.tar.bz2 nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.tar.lz nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.tar.xz nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.tar.zst nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.zip | |
Merge commit 'd26027792812fbfad4d0f451b5f47fdabf7fdeb9'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/kde-frameworks/extra-cmake-modules')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch b/nixpkgs/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch index 66f10f4abc1e..bd105d2b4a9c 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch @@ -1,5 +1,5 @@ diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake -index 52b2eb2..a04596c 100644 +index 275fd65..a04596c 100644 --- a/kde-modules/KDEInstallDirs.cmake +++ b/kde-modules/KDEInstallDirs.cmake @@ -232,34 +232,6 @@ @@ -14,7 +14,7 @@ index 52b2eb2..a04596c 100644 -# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf -# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if -# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu" --# See http://wiki.debian.org/Multiarch +-# See https://wiki.debian.org/Multiarch -if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU") - AND NOT CMAKE_CROSSCOMPILING - AND NOT DEFINED ENV{FLATPAK_ID}) |