diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2013-01-14 07:23:03 +0100 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2013-01-14 07:23:03 +0100 |
| commit | a7fba8bfefe814f66c416998ebc19410a78ba0a7 (patch) | |
| tree | f75e8e39326b150ad8e44f1ea4b6a0a3245e9018 /overrides | |
| parent | c4e5424ab243933f26afb61d3072d25e465da54f (diff) | |
overrides: Move librxtx_java into a subdirectory.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'overrides')
| -rw-r--r-- | overrides/default.nix | 23 | ||||
| -rw-r--r-- | overrides/librxtx-java/default.nix | 24 |
2 files changed, 25 insertions, 22 deletions
diff --git a/overrides/default.nix b/overrides/default.nix index 1a1a61d4..170c8d39 100644 --- a/overrides/default.nix +++ b/overrides/default.nix @@ -144,28 +144,7 @@ let buildInputs = [ pkgconfig pulseaudio ]; }; - librxtx_java = stdenv.mkDerivation rec { - name = "rxtx-${version}"; - version = "2.1-7r2"; - - buildInputs = [ unzip jdk ]; - - NIX_CFLAGS_COMPILE = "-DUTS_RELEASE=\"3.8.0\""; - - makeFlags = [ - "JHOME=$(out)/lib/java" - "RXTX_PATH=$(out)/lib" - ]; - - preInstall = '' - mkdir -p "$out/lib/java" - ''; - - src = fetchurl { - url = "http://rxtx.qbang.org/pub/rxtx/${name}.zip"; - sha256 = "1nfxdbiamr8dmls4zbdcdk4hf916gnr1jmcpb1kpc1b1m193inri"; - }; - }; + librxtx_java = callPackage ./librxtx-java { }; axbo = callPackage ./axbo { }; }; diff --git a/overrides/librxtx-java/default.nix b/overrides/librxtx-java/default.nix new file mode 100644 index 00000000..6b384f9f --- /dev/null +++ b/overrides/librxtx-java/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, unzip, jdk }: + +stdenv.mkDerivation rec { + name = "rxtx-${version}"; + version = "2.1-7r2"; + + buildInputs = [ unzip jdk ]; + + NIX_CFLAGS_COMPILE = "-DUTS_RELEASE=\"3.8.0\""; + + makeFlags = [ + "JHOME=$(out)/lib/java" + "RXTX_PATH=$(out)/lib" + ]; + + preInstall = '' + mkdir -p "$out/lib/java" + ''; + + src = fetchurl { + url = "http://rxtx.qbang.org/pub/rxtx/${name}.zip"; + sha256 = "1nfxdbiamr8dmls4zbdcdk4hf916gnr1jmcpb1kpc1b1m193inri"; + }; +} |