diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2013-05-19 14:57:25 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2013-05-19 14:57:25 +0200 |
| commit | 8b8574eda55eca70178c3ba205ad73055bca52c8 (patch) | |
| tree | ff5a5ae3c0958290d992e90be4bb494e8a33f66b /overrides | |
| parent | d8f329093e57bf7e1889551bebc9c09f472ee949 (diff) | |
rxtx: Add lockdev library to dependencies.
This is primarily to ensure that the lock files reside in /tmp/ but I wonder if /run/lock should be set sticky on NixOS by default? Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'overrides')
| -rw-r--r-- | overrides/default.nix | 1 | ||||
| -rw-r--r-- | overrides/librxtx-java/default.nix | 6 | ||||
| -rw-r--r-- | overrides/lockdev/default.nix | 23 |
3 files changed, 28 insertions, 2 deletions
diff --git a/overrides/default.nix b/overrides/default.nix index 9633c903..626e897e 100644 --- a/overrides/default.nix +++ b/overrides/default.nix @@ -50,6 +50,7 @@ let blop = callPackage ./blop { }; libCMT = callPackage ./libcmt { }; librxtx_java = callPackage ./librxtx-java { }; + lockdev = callPackage ./lockdev { }; pvolctrl = callPackage ./pvolctrl { }; tkabber_urgent_plugin = callPackage ./tkabber-urgent-plugin { }; }; diff --git a/overrides/librxtx-java/default.nix b/overrides/librxtx-java/default.nix index 6b384f9f..5dd65c8d 100644 --- a/overrides/librxtx-java/default.nix +++ b/overrides/librxtx-java/default.nix @@ -1,13 +1,15 @@ -{ stdenv, fetchurl, unzip, jdk }: +{ stdenv, fetchurl, unzip, jdk, lockdev }: stdenv.mkDerivation rec { name = "rxtx-${version}"; version = "2.1-7r2"; - buildInputs = [ unzip jdk ]; + buildInputs = [ unzip jdk lockdev ]; NIX_CFLAGS_COMPILE = "-DUTS_RELEASE=\"3.8.0\""; + configureFlags = [ "--enable-liblock" ]; + makeFlags = [ "JHOME=$(out)/lib/java" "RXTX_PATH=$(out)/lib" diff --git a/overrides/lockdev/default.nix b/overrides/lockdev/default.nix new file mode 100644 index 00000000..52e78eb5 --- /dev/null +++ b/overrides/lockdev/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, perl }: + +let + baseurl = "ftp://ftp.debian.org/debian/pool/main/l/lockdev/"; +in stdenv.mkDerivation rec { + name = "lockdev-${version}"; + version = "1.0.3"; + + buildInputs = [ perl ]; + + patches = stdenv.lib.singleton (fetchurl { + url = baseurl + "lockdev_1.0.3-1.5.diff.gz"; + sha256 = "1l3pq1nfb5qx3i91cjaiz3c53368gw6m28a5mv9391n5gmsdmi3r"; + }); + + NIX_CFLAGS_COMPILE = "-fPIC -D_PATH_LOCK=\"/tmp\""; + installFlags = [ "basedir=$(out)" ]; + + src = fetchurl { + url = baseurl + "lockdev_${version}.orig.tar.gz"; + sha256 = "10lzhq6r2dn8y3ki7wlqsa8s3ndkf842bszcjw4dbzf3g9fn7bnc"; + }; +} |