diff options
| author | Theodoros Foradis <theodoros@foradis.org> | 2017-12-04 12:02:46 +0200 |
|---|---|---|
| committer | Danny Milosavljevic <dannym@scratchpost.org> | 2017-12-06 20:22:09 +0100 |
| commit | 6a7e81c8a2f7af98ccf5c99f1edeb25cc0890eef (patch) | |
| tree | 75112e6ffed41dcca12d95f1f02d47f8e224525e | |
| parent | 0e1a3e7a1ebc6660fe0e69a06df4a38cb851c3de (diff) | |
| download | guix-6a7e81c8a2f7af98ccf5c99f1edeb25cc0890eef.tar.gz | |
gnu: kicad: Install libraries to PREFIX/lib, not PREFIX/lib64.
* gnu/packages/engineering.scm (kicad)[arguments]: <phases>: Remove install-lib-3d. <configure-flags>: Add "-DCMAKE_INSTALL_LIBDIR".
| -rw-r--r-- | gnu/packages/engineering.scm | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 5c36de1dd2..77b1386b53 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -693,6 +693,8 @@ language.") (string-take commit 7)) "-DCMAKE_BUILD_TYPE=Release" "-DKICAD_SKIP_BOOST=ON"; Use our system's boost library. + (string-append "-DCMAKE_INSTALL_LIBDIR=" + (assoc-ref %outputs "out") "/lib") "-DKICAD_SCRIPTING=ON" "-DKICAD_SCRIPTING_MODULES=ON" "-DKICAD_SCRIPTING_WXPYTHON=ON" @@ -721,14 +723,6 @@ language.") `("PYTHONPATH" ":" prefix (,path)) `("PATH" ":" prefix (,(string-append python "/bin:"))))) - #t)) - (add-after 'wrap-program 'install-lib-3d - (lambda* (#:key inputs outputs #:allow-other-keys) - (for-each - (lambda (file) - (install-file file (string-append (assoc-ref outputs "out") - "/lib"))) - (find-files "." "^libkicad_3dsg.*")) #t))))) (native-inputs `(("boost" ,boost) |