diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-04-14T19·05+0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-04-14T19·05+0200 |
| commit | 0b5107c016080e70d30ccba3afa0f9aa7a90a891 (patch) | |
| tree | 176724458a501591ae129aed133c95d2ecea1e71 /corepkgs | |
| parent | 1d0bafb74d17f14778005a633ee332ad0ad9ba9e (diff) | |
If the (redirected) channel URL contains a version number, use it
Diffstat (limited to 'corepkgs')
| -rw-r--r-- | corepkgs/unpack-channel.nix | 4 | ||||
| -rw-r--r-- | corepkgs/unpack-channel.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/corepkgs/unpack-channel.nix b/corepkgs/unpack-channel.nix index eba957dff4..170f3ab07c 100644 --- a/corepkgs/unpack-channel.nix +++ b/corepkgs/unpack-channel.nix @@ -1,11 +1,11 @@ with import <nix/config.nix>; -{ name, src }: +{ name, channelName, src }: derivation { system = builtins.currentSystem; builder = shell; args = [ "-e" ./unpack-channel.sh ]; - inherit name src bzip2 tar tr; + inherit name channelName src bzip2 tar tr; PATH = "${nixBinDir}:${coreutils}"; } diff --git a/corepkgs/unpack-channel.sh b/corepkgs/unpack-channel.sh index 0b7d89bc46..f42b0870ae 100644 --- a/corepkgs/unpack-channel.sh +++ b/corepkgs/unpack-channel.sh @@ -1,4 +1,4 @@ mkdir $out cd $out $bzip2 -d < $src | $tar xf - -mv * $out/$name +mv * $out/$channelName |