diff options
| author | Mark H Weaver <mhw@netris.org> | 2014-09-11 18:26:28 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2014-09-11 18:26:28 -0400 |
| commit | 66ea98e321e93b0806f6870d77dd4c00e7e720c0 (patch) | |
| tree | 21778401485e3b8683bbc6a31769233c059683b1 /gnu/packages/linux.scm | |
| parent | da5538ef44bfa74d3e435f9f557374eabba5dc1e (diff) | |
| parent | 5dae0186dea1e72e73bf223161620cfeddef5a63 (diff) | |
| download | guix-66ea98e321e93b0806f6870d77dd4c00e7e720c0.tar guix-66ea98e321e93b0806f6870d77dd4c00e7e720c0.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/image.scm
Diffstat (limited to 'gnu/packages/linux.scm')
| -rw-r--r-- | gnu/packages/linux.scm | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 442f80103a..7be0d076ec 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -30,7 +30,7 @@ #:use-module (gnu packages libusb) #:use-module (gnu packages ncurses) #:use-module (gnu packages pciutils) - #:use-module (gnu packages bdb) + #:use-module (gnu packages databases) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -613,6 +613,9 @@ MIDI functionality to the Linux-based operating system.") (arguments ;; XXX: Disable man page creation until we have DocBook. '(#:configure-flags (list "--disable-xmlto" + + ;; The udev rule is responsible for restoring + ;; the volume. (string-append "--with-udev-rules-dir=" (assoc-ref %outputs "out") "/lib/udev/rules.d")) @@ -1397,7 +1400,13 @@ time.") (assoc-ref %outputs "out") "/etc/lvm") "--enable-udev_sync" - "--enable-udev_rules") + "--enable-udev_rules" + + ;; Make sure programs such as 'dmsetup' can + ;; find libdevmapper.so. + (string-append "LDFLAGS=-Wl,-rpath=" + (assoc-ref %outputs "out") + "/lib")) ;; The tests use 'mknod', which requires root access. #:tests? #f)) |