diff options
author | Marius Bakke <mbakke@fastmail.com> | 2017-12-07 18:26:11 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2017-12-07 18:26:11 +0100 |
commit | 9e111db4535b3cd5729e37294ae51d95240334b4 (patch) | |
tree | cc90a9de80ff39bd93426b763918d904abfeeb56 /gnu/packages/engineering.scm | |
parent | 92b61d3e1bb50f0c1d087bc8d57cc00c3ce360df (diff) | |
parent | cf69135d5e6797e566b8bb18419ae9e3c8aeb621 (diff) | |
download | guix-patches-9e111db4535b3cd5729e37294ae51d95240334b4.tar guix-patches-9e111db4535b3cd5729e37294ae51d95240334b4.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/engineering.scm')
-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) |