diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
commit | 62614cbef7da005c1eda8c9400160f6bcd6546b8 (patch) | |
tree | c2630f69080637987b68acb1ee8676d2681fe304 /pkgs/development/r-modules/patches | |
parent | d9c82ed3044c72cecf01c6ea042489d30914577c (diff) | |
parent | e24069138dfec3ef94f211f1da005bb5395adc11 (diff) | |
download | nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.gz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.bz2 nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.lz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.xz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.zst nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.zip |
Merge branch 'nixpkgs-update' into master
Diffstat (limited to 'pkgs/development/r-modules/patches')
-rw-r--r-- | pkgs/development/r-modules/patches/qtbase.patch | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/pkgs/development/r-modules/patches/qtbase.patch b/pkgs/development/r-modules/patches/qtbase.patch deleted file mode 100644 index 14427b72630..00000000000 --- a/pkgs/development/r-modules/patches/qtbase.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ru -x '*~' qtbase_orig/src/Makefile qtbase/src/Makefile ---- qtbase_orig/src/Makefile 2012-03-03 03:57:47.000000000 +0900 -+++ qtbase/src/Makefile 2014-11-01 23:06:51.383876323 +0900 -@@ -10,6 +10,9 @@ - -DR_INCLUDES=${R_INCLUDE_DIR} \ - -DCMAKE_INSTALL_PREFIX=../src; \ - make install -+# I could not control RPATH via CMake. HELP WANTED! -+ patchelf --set-rpath ${CMAKE_LIBRARY_PATH} qtbase.so -+ find ../inst/local/ -executable -type f -print0 | xargs -0 patchelf --set-rpath ${CMAKE_LIBRARY_PATH} - - clean: - rm -rf ../kdebindings-build |