diff options
author | aszlig <aszlig@redmoonstudios.org> | 2013-01-14 06:44:52 +0100 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2013-01-14 06:51:28 +0100 |
commit | 6fba674ea11f017578a1df6e79e29e7a9399f6a4 (patch) | |
tree | f7b6a24de25b012540bbafe52c65680b22a14fbe /overrides/default.nix | |
parent | a51bcb2528c1618d1f1506f3bb7374309f7bd9df (diff) |
overrides: Completely separate environments.
Environments are now handled through nixpkgs/config.nix and get all packages from nixpkgs plus the packageOverrides in ../overrides. So we can actually remove "p" in overrides/default.nix which was recursively referencing the overrides attrs. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'overrides/default.nix')
-rw-r--r-- | overrides/default.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/overrides/default.nix b/overrides/default.nix index e2f0ce1a..f70853ab 100644 --- a/overrides/default.nix +++ b/overrides/default.nix @@ -3,7 +3,9 @@ pkgs: with { tkabberRev = 2009; }; -with pkgs; let p = { +with pkgs; + +rec { pulseaudio = pulseaudio.override { useSystemd = true; }; @@ -208,7 +210,7 @@ with pkgs; let p = { name = "axbo-research-${version}"; version = "2.0.18"; - buildInputs = [ jre p.librxtx_java ]; + buildInputs = [ jre librxtx_java ]; unpackCmd = let fontconfigFile = makeFontsConf { @@ -264,8 +266,8 @@ with pkgs; let p = { cat > "$out/bin/axbo-research" <<WRAPPER #!${stdenv.shell} - ${jre}/bin/java -Djava.library.path="${p.librxtx_java}/lib" \ - -classpath "${p.librxtx_java}/lib/java/*:$out/lib/java/*" \ + ${jre}/bin/java -Djava.library.path="${librxtx_java}/lib" \ + -classpath "${librxtx_java}/lib/java/*:$out/lib/java/*" \ -jar "$out/libexec/axbo.jar" WRAPPER chmod +x "$out/bin/axbo-research" @@ -278,4 +280,4 @@ with pkgs; let p = { sha256 = "1zc3bpqfa5pdpl7masigvv98mi5phl04p80fyd2ink33xbmik70z"; }; }; -}; in p // (import ../envs (pkgs // p)) +} |