fix regressions where "${repo}-${rev}-scr" pattern was hardcoded

2017-07-04 20:22:13 +00:00
parent 535a6c3520
commit b935b21ffd
4 changed files with 4 additions and 4 deletions
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
  inherit name;

  srcs = [ src robtkSrc ];
-  sourceRoot = "sisco.lv2-${src.rev}-src";
+  sourceRoot = src.name;

  buildInputs = [ pkgconfig lv2 pango cairo libjack2 mesa ];

@@ -59,7 +59,7 @@ let
        srcs = [ rubySrc rubygemsSrc ];
        sourceRoot =
          if useRailsExpress then
-            "ruby-${tag}-src"
+            rubySrc.name
          else
            unpackdir rubySrc;

@@ -10,7 +10,7 @@ let
    sha256 = "1vmbrw686f41n6xfjphfshn96vl07ynvnsyjdw9yfn9bfnldcjcq";
  };

-  srcRoot = "pfixtools-${pfixtoolsSrc.rev}-src";
+  srcRoot = pfixtoolsSrc.name;

  libCommonSrc = fetchFromGitHub {
    owner = "Fruneau";
@@ -8,7 +8,7 @@ let
    sha256 = "1cxxzhm36civ6vjdgrk7mfmlzkih44kdii6l2xgy4r434s8rzcpn";
  };

-  srcRoot = "eMail-${eMailSrc.rev}-src";
+  srcRoot = eMailSrc.name;

  dlibSrc = fetchFromGitHub {
    owner = "deanproxy";