mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-12 23:23:36 +00:00
571c71e6f7
We are migrating packages that meet below requirements:
1. using `callPackage`
2. called path is a directory
3. overriding set is empty (`{ }`)
4. not containing path expressions other than relative path (to
makenixpkgs-vet happy)
5. not referenced by nix files outside of the directory, other
than`pkgs/top-level/all-packages.nix`
6. not referencing nix files outside of the directory
7. not referencing `default.nix` (since it's changed to `package.nix`)
8. `outPath` doesn't change after migration
The tool is here: https://github.com/Aleksanaa/by-name-migrate.
22 lines
833 B
Diff
22 lines
833 B
Diff
Fix CMake install path
|
|
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -1141,11 +1141,11 @@
|
|
|
|
set(prefix "${CMAKE_INSTALL_PREFIX}")
|
|
set(exec_prefix "\${prefix}")
|
|
-set(bindir "\${exec_prefix}/${CMAKE_INSTALL_BINDIR}")
|
|
-set(sbindir "\${exec_prefix}/${CMAKE_INSTALL_SBINDIR}")
|
|
-set(libdir "\${prefix}/${CMAKE_INSTALL_LIBDIR}")
|
|
-set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
|
|
-set(datarootdir "\${prefix}/${CMAKE_INSTALL_DATAROOTDIR}")
|
|
+set(bindir "${CMAKE_INSTALL_FULL_BINDIR}")
|
|
+set(sbindir "${CMAKE_INSTALL_FULL_SBINDIR}")
|
|
+set(libdir "${CMAKE_INSTALL_FULL_LIBDIR}")
|
|
+set(includedir "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
|
|
+set(datarootdir "${CMAKE_INSTALL_FULL_DATAROOTDIR}")
|
|
set(datadir "\${datarootdir}")
|
|
set(expanded_pluginsdir "${GRN_PLUGINS_DIR}")
|
|
set(GRN_EXPANDED_DEFAULT_DOCUMENT_ROOT "${GRN_DEFAULT_DOCUMENT_ROOT}")
|