diff options
author | Volth <volth@webmaster.ms> | 2017-06-26 18:10:37 +0000 |
---|---|---|
committer | Volth <volth@webmaster.ms> | 2017-07-04 20:22:13 +0000 |
commit | b935b21ffd06284d0c8297651d7d28c0961d3274 (patch) | |
tree | fb038aadb746af3f55321d135ecb2e2fbc742f97 | |
parent | 535a6c3520c3e34c5d74008764d12165650ec4d4 (diff) | |
download | nixpkgs-b935b21ffd06284d0c8297651d7d28c0961d3274.tar nixpkgs-b935b21ffd06284d0c8297651d7d28c0961d3274.tar.gz nixpkgs-b935b21ffd06284d0c8297651d7d28c0961d3274.tar.bz2 nixpkgs-b935b21ffd06284d0c8297651d7d28c0961d3274.tar.lz nixpkgs-b935b21ffd06284d0c8297651d7d28c0961d3274.tar.xz nixpkgs-b935b21ffd06284d0c8297651d7d28c0961d3274.tar.zst nixpkgs-b935b21ffd06284d0c8297651d7d28c0961d3274.zip |
fix regressions where "${repo}-${rev}-scr" pattern was hardcoded
-rw-r--r-- | pkgs/applications/audio/sisco.lv2/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/interpreters/ruby/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/mail/postfix/pfixtools.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/networking/email/default.nix | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/audio/sisco.lv2/default.nix b/pkgs/applications/audio/sisco.lv2/default.nix index d429d545234..8ac7a9115ca 100644 --- a/pkgs/applications/audio/sisco.lv2/default.nix +++ b/pkgs/applications/audio/sisco.lv2/default.nix @@ -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 ]; diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index a552b2719bb..f3d4ae4bb00 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -59,7 +59,7 @@ let srcs = [ rubySrc rubygemsSrc ]; sourceRoot = if useRailsExpress then - "ruby-${tag}-src" + rubySrc.name else unpackdir rubySrc; diff --git a/pkgs/servers/mail/postfix/pfixtools.nix b/pkgs/servers/mail/postfix/pfixtools.nix index 1bbe6f3466b..6a0d7fb588f 100644 --- a/pkgs/servers/mail/postfix/pfixtools.nix +++ b/pkgs/servers/mail/postfix/pfixtools.nix @@ -10,7 +10,7 @@ let sha256 = "1vmbrw686f41n6xfjphfshn96vl07ynvnsyjdw9yfn9bfnldcjcq"; }; - srcRoot = "pfixtools-${pfixtoolsSrc.rev}-src"; + srcRoot = pfixtoolsSrc.name; libCommonSrc = fetchFromGitHub { owner = "Fruneau"; diff --git a/pkgs/tools/networking/email/default.nix b/pkgs/tools/networking/email/default.nix index 017da63a1e9..c7a6fbcfd7c 100644 --- a/pkgs/tools/networking/email/default.nix +++ b/pkgs/tools/networking/email/default.nix @@ -8,7 +8,7 @@ let sha256 = "1cxxzhm36civ6vjdgrk7mfmlzkih44kdii6l2xgy4r434s8rzcpn"; }; - srcRoot = "eMail-${eMailSrc.rev}-src"; + srcRoot = eMailSrc.name; dlibSrc = fetchFromGitHub { owner = "deanproxy"; |