Skip to content

Commit 35688bc

Browse files
fiddle dependency relations
1 parent 8524c85 commit 35688bc

File tree

3 files changed

+16
-6
lines changed

3 files changed

+16
-6
lines changed

flake.nix

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,20 @@
1212
in
1313
{
1414
packages = rec {
15-
acme = pkgs.callPackage ./nix/acme.nix { inherit plan9tools; };
16-
sam = pkgs.callPackage ./nix/sam.nix { inherit plan9tools; };
15+
acme = pkgs.symlinkJoin {
16+
name = "acme";
17+
paths = [
18+
(pkgs.callPackage ./nix/acme.nix { })
19+
plan9tools
20+
];
21+
};
22+
sam = pkgs.symlinkJoin {
23+
name = "sam";
24+
paths = [
25+
(pkgs.callPackage ./nix/sam.nix { })
26+
plan9tools
27+
];
28+
};
1729
plan9tools = pkgs.callPackage ./nix/plan9tools.nix { };
1830
};
1931
formatter = pkgs.nixfmt-rfc-style;

nix/acme.nix

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{pkgs, lib, stdenv, plan9tools, ...}:
1+
{pkgs, lib, stdenv, ...}:
22
stdenv.mkDerivation {
33
name = "acme";
44
src = lib.cleanSource ../.;
@@ -8,7 +8,6 @@ stdenv.mkDerivation {
88
libXt
99
fontconfig
1010
];
11-
propagatedBuildInputs = [ plan9tools ];
1211
configurePhase = ''
1312
patchShebangs ./configure
1413
./configure acme

nix/sam.nix

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{pkgs, lib, stdenv, plan9tools, ...}:
1+
{pkgs, lib, stdenv, ...}:
22
stdenv.mkDerivation {
33
name = "sam";
44
src = lib.cleanSource ../.;
@@ -8,7 +8,6 @@ stdenv.mkDerivation {
88
libXt
99
fontconfig
1010
];
11-
propagatedBuildInputs = [ plan9tools ];
1211
configurePhase = ''
1312
patchShebangs ./configure
1413
./configure sam

0 commit comments

Comments
 (0)