From efaec90f603762d10d658e80bbe9870badd51e76 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Thu, 27 Jul 2017 21:14:31 +0100 Subject: [PATCH] fetchbower: handle packages with slashes in their name Packages from github repos have slashes in their name. Nix store names shouldn't have slashes. Fixes rvl/bower2nix#13 --- pkgs/build-support/fetchbower/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchbower/default.nix b/pkgs/build-support/fetchbower/default.nix index 835fbec6bf0..dd0bac49cb6 100644 --- a/pkgs/build-support/fetchbower/default.nix +++ b/pkgs/build-support/fetchbower/default.nix @@ -7,8 +7,10 @@ let ver = if builtins.length components == 1 then version else hash; in ver; + bowerName = name: lib.replaceStrings ["/"] ["-"] name; + fetchbower = name: version: target: outputHash: stdenv.mkDerivation { - name = "${name}-${bowerVersion version}"; + name = "${bowerName name}-${bowerVersion version}"; SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; buildCommand = '' fetch-bower --quiet --out=$PWD/out "${name}" "${target}" "${version}"