From a7fba8bfefe814f66c416998ebc19410a78ba0a7 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 14 Jan 2013 07:23:03 +0100
Subject: overrides: Move librxtx_java into a subdirectory.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 overrides/default.nix              | 23 +----------------------
 overrides/librxtx-java/default.nix | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 22 deletions(-)
 create mode 100644 overrides/librxtx-java/default.nix

(limited to 'overrides')

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";
+  };
+}
-- 
cgit 1.4.1