diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2021-04-16 14:39:48 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2021-04-16 14:39:48 +0300 |
| commit | fcc39864dba82e14895afbe841091091366c96bc (patch) | |
| tree | 6e0f05495fd6512051224dc85fd3ab495cbf1a24 /gnu/packages/education.scm | |
| parent | 76fc36d0a7215979bb74c05840f5a4de4ab5ea93 (diff) | |
| parent | 44f9432705d04c069a8acf9e37e3ad856ac0bf82 (diff) | |
| download | guix-patches-fcc39864dba82e14895afbe841091091366c96bc.tar guix-patches-fcc39864dba82e14895afbe841091091366c96bc.tar.gz | |
Merge remote-tracking branch 'origin/master' into core-updates
Conflicts:
gnu/local.mk
gnu/packages/boost.scm
gnu/packages/chez.scm
gnu/packages/compression.scm
gnu/packages/crates-io.scm
gnu/packages/docbook.scm
gnu/packages/engineering.scm
gnu/packages/gcc.scm
gnu/packages/gl.scm
gnu/packages/gtk.scm
gnu/packages/nettle.scm
gnu/packages/python-check.scm
gnu/packages/python-xyz.scm
gnu/packages/radio.scm
gnu/packages/rust.scm
gnu/packages/sqlite.scm
guix/build-system/node.scm
Diffstat (limited to 'gnu/packages/education.scm')
| -rw-r--r-- | gnu/packages/education.scm | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index c61fdd32a6..2118ebbf6e 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -689,17 +689,6 @@ language and very flexible regarding to new or unknown keyboard layouts.") (sha256 (base32 "10lm2p8w26c9n6lhvw3301myfss0dq7hl7rawzb3hsy1lqvmvdib")))) (build-system qt-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'configure 'patch-makefiles - (lambda* (#:key inputs #:allow-other-keys) - (let ((qtdec (assoc-ref inputs "qtdeclarative"))) - (substitute* '("src/CMakeFiles/ktouch_autogen.dir/build.make" - "src/CMakeFiles/ktouch.dir/build.make") - (("/gnu/store/.*qmlcachegen") - (string-append qtdec "/bin/qmlcachegen")))) - #t))))) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("kdoctools" ,kdoctools) |