fix source root locations.

These have changed following commit
https://github.com/NixOS/nixpkgs/commit/c3255fe8ec326d2c8fe9462d49ed83aa64d3e68f.

See also:

- https://github.com/NixOS/nixpkgs/pull/31004
- https://github.com/NixOS/nixpkgs/pull/31106

25 files changed, 72 insertions, 24 deletions

diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix
index f5f580b3664..00f58750408 100644
--- a/pkgs/applications/audio/puddletag/default.nix
+++ b/pkgs/applications/audio/puddletag/default.nix
@@ -11,7 +11,9 @@ python2Packages.buildPythonApplication rec {
     sha256 = "1g6wa91awy17z5b704yi9kfynnvfm9lkrvpfvwccscr1h8s3qmiz";
   };
 
-  sourceRoot = "source/source";
+  setSourceRoot = ''
+    sourceRoot=$(echo */source)
+  '';
 
   disabled = python2Packages.isPy3k; # work to support python 3 has not begun
 
diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix
index 669e46c6a84..ac0060ec7f8 100644
--- a/pkgs/applications/graphics/nomacs/default.nix
+++ b/pkgs/applications/graphics/nomacs/default.nix
@@ -30,7 +30,9 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  sourceRoot = "${name}-src/ImageLounge";
+  setSourceRoot = ''
+    sourceRoot=$(echo */ImageLounge)
+  '';
 
   patches = [./fix-appdata-install.patch];
 
diff --git a/pkgs/applications/graphics/screencloud/default.nix b/pkgs/applications/graphics/screencloud/default.nix
index 6f2b0e34cbb..cffe485711f 100644
--- a/pkgs/applications/graphics/screencloud/default.nix
+++ b/pkgs/applications/graphics/screencloud/default.nix
@@ -43,7 +43,9 @@ stdenv.mkDerivation rec {
     "-DCONSUMER_SECRET_SCREENCLOUD=${consumerSecret}"
   ];
 
-  sourceRoot = "screencloud-v${version}-src/screencloud";
+  setSourceRoot = ''
+    sourceRoot=$(echo */screencloud)
+  '';
 
   preConfigure = ''
     # This needs to be set in preConfigure instead of cmakeFlags in order to
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix
index 53d1f30bee6..7ab9b194791 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix
@@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
     sha256 = "1lxpz316jmns6i143v4j6sd6k0a4a54alw08rvwjckf2rig57lj2";
   };
 
-  sourceRoot = "skype4pidgin-${version}-src/skypeweb";
+  setSourceRoot = ''
+    sourceRoot=$(echo */skypeweb)
+  '';
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ pidgin json_glib ];
diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/applications/science/misc/golly/default.nix
index 8902bacf11c..94e7c0efaae 100644
--- a/pkgs/applications/science/misc/golly/default.nix
+++ b/pkgs/applications/science/misc/golly/default.nix
@@ -20,7 +20,9 @@ stdenv.mkDerivation rec {
     inherit (s) url sha256;
   };
 
-  sourceRoot="${name}-src/gui-wx/configure";
+  setSourceRoot = ''
+    sourceRoot=$(echo */gui-wx/configure)
+  '';
 
   # Link against Python explicitly as it is needed for scripts
   makeFlags=[
diff --git a/pkgs/development/compilers/dmd/2.067.1.nix b/pkgs/development/compilers/dmd/2.067.1.nix
index 6fab56e4e7d..6a3cddbd2e5 100644
--- a/pkgs/development/compilers/dmd/2.067.1.nix
+++ b/pkgs/development/compilers/dmd/2.067.1.nix
@@ -17,18 +17,21 @@ stdenv.mkDerivation rec {
     repo = "dmd";
     rev = "v${version}";
     sha256 = "0fm29lg8axfmzdaj0y6vg70lhwb5d9rv4aavnvdd15xjschinlcz";
+    name = "dmd-v${version}-src";
   })
   (fetchFromGitHub {
     owner = "dlang";
     repo = "druntime";
     rev = "v${version}";
     sha256 = "1n2qfw9kmnql0fk2nxikispqs7vh85nhvyyr00fk227n9lgnqf02";
+    name = "druntime-v${version}-src";
   })
   (fetchFromGitHub {
     owner = "dlang";
     repo = "phobos";
     rev = "v${version}";
     sha256 = "0fywgds9xvjcgnqxmpwr67p3wi2m535619pvj159cgwv5y0nr3p1";
+    name = "phobos-v${version}-src";
   })
   ];
 
diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix
index 27f70b8d6c7..938dd04904b 100644
--- a/pkgs/development/compilers/dmd/default.nix
+++ b/pkgs/development/compilers/dmd/default.nix
@@ -14,18 +14,21 @@ stdenv.mkDerivation rec {
     repo = "dmd";
     rev = "v${version}";
     sha256 = "0kq6r8rcghvzk5jcphg89l85rg734s29bssd2rcw3fygx0k9a9k5";
+    name = "dmd-v${version}-src";
   })
   (fetchFromGitHub {
     owner = "dlang";
     repo = "druntime";
     rev = "v${version}";
     sha256 = "0idn2v1lmp7hl637g3i7pdfj9mjk4sclkz4cm77nl8873k2fhk8j";
+    name = "druntime-v${version}-src";
   })
   (fetchFromGitHub {
     owner = "dlang";
     repo = "phobos";
     rev = "v${version}";
     sha256 = "1a7q5fd15yspgs5plxgx54jyrcwgzlyw3rahmz04jd2s5h56dj04";
+    name = "phobos-v${version}-src";
   })
   ];
 
diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix
index 4be27531888..5c283dd4380 100644
--- a/pkgs/development/compilers/ldc/default.nix
+++ b/pkgs/development/compilers/ldc/default.nix
@@ -11,24 +11,28 @@ stdenv.mkDerivation rec {
     repo = "ldc";
     rev = "v${version}";
     sha256 = "1ac3j4cwwgjpayhijxx4d6478bc3iqksjxkd7xp7byx7k8w1ppdl";
+    name = "ldc-v${version}-src";
   })
   (fetchFromGitHub {
     owner = "ldc-developers";
     repo = "druntime";
     rev = "ldc-v${version}";
     sha256 = "1m13370wnj3sizqk3sdpzi9am5d24srf27d613qblhqa9n8vwz30";
+    name = "druntime-ldc-v${version}-src";
   })
   (fetchFromGitHub {
     owner = "ldc-developers";
     repo = "phobos";
     rev = "ldc-v${version}";
     sha256 = "0fhcdfi7a00plwj27ysfyv783nhk0kspq7hawf6vbsl3s1nyvn8g";
+    name = "phobos-ldc-v${version}-src";
   })
   (fetchFromGitHub {
     owner = "ldc-developers";
     repo = "dmd-testsuite";
     rev = "ldc-v${version}";
     sha256 = "0dmdkp220gqhxjrmrjfkf0vsvylwfaj70hswavq4q3v4dg17pzmj";
+    name = "dmd-testsuite-ldc-v${version}-src";
   })
   ];
 
diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix
index c5a6f55681a..9805930c7bf 100644
--- a/pkgs/development/libraries/bobcat/default.nix
+++ b/pkgs/development/libraries/bobcat/default.nix
@@ -16,7 +16,9 @@ stdenv.mkDerivation rec {
   buildInputs = [ libmilter libX11 openssl readline utillinux ];
   nativeBuildInputs = [ icmake yodl ];
 
-  sourceRoot = "bobcat-${version}-src/bobcat";
+  setSourceRoot = ''
+    sourceRoot=$(echo */bobcat)
+  '';
 
   postPatch = ''
     substituteInPlace INSTALL.im --replace /usr $out
diff --git a/pkgs/development/libraries/cxxtest/default.nix b/pkgs/development/libraries/cxxtest/default.nix
index c620777dc5b..aa0708daaa7 100644
--- a/pkgs/development/libraries/cxxtest/default.nix
+++ b/pkgs/development/libraries/cxxtest/default.nix
@@ -13,7 +13,9 @@ in python2Packages.buildPythonApplication rec {
     sha256 = "19w92kipfhp5wvs47l0qpibn3x49sbmvkk91yxw6nwk6fafcdl17";
   };
 
-  sourceRoot = "${name}-src/python";
+  setSourceRoot = ''
+    sourceRoot=$(echo */python)
+  '';
 
   meta = with stdenv.lib; {
     homepage = http://cxxtest.com;
diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix
index b172b82a295..2940ab45eaa 100644
--- a/pkgs/development/libraries/openvdb/default.nix
+++ b/pkgs/development/libraries/openvdb/default.nix
@@ -16,7 +16,9 @@ stdenv.mkDerivation rec
 
   buildInputs = [ unzip openexr boost tbb jemalloc c-blosc ilmbase ];
 
-  sourceRoot = "openvdb-v${version}-src/openvdb";
+  setSourceRoot = ''
+    sourceRoot=$(echo */openvdb)
+  '';
 
   installTargets = "install_lib";
 
diff --git a/pkgs/development/libraries/partio/default.nix b/pkgs/development/libraries/partio/default.nix
index ed0f38f8538..4f93ed56211 100644
--- a/pkgs/development/libraries/partio/default.nix
+++ b/pkgs/development/libraries/partio/default.nix
@@ -16,8 +16,6 @@ stdenv.mkDerivation rec
 
   buildInputs = [ unzip cmake freeglut mesa zlib swig python doxygen xorg.libXi xorg.libXmu ];
 
-  sourceRoot = "partio-v${version}-src";
-
   enableParallelBuilding = true;
 
   buildPhase = ''
diff --git a/pkgs/development/libraries/ptex/default.nix b/pkgs/development/libraries/ptex/default.nix
index 7774cdbcb88..d40ae856495 100644
--- a/pkgs/development/libraries/ptex/default.nix
+++ b/pkgs/development/libraries/ptex/default.nix
@@ -16,8 +16,6 @@ stdenv.mkDerivation rec
 
   buildInputs = [ zlib python cmake ];
 
-  sourceRoot = "ptex-v${version}-src";
-
   enableParallelBuilding = true;
 
   buildPhase = ''
diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix
index 9185f5b9eaa..c79f238673e 100644
--- a/pkgs/development/tools/build-managers/icmake/default.nix
+++ b/pkgs/development/tools/build-managers/icmake/default.nix
@@ -11,7 +11,10 @@ stdenv.mkDerivation rec {
     owner = "fbb-git";
   };
 
-  sourceRoot = "icmake-${version}-src/icmake";
+
+  setSourceRoot = ''
+    sourceRoot=$(echo */icmake)
+  '';
 
   buildInputs = [ gcc ];
 
diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix
index 1eed4c2ad86..e0bf9eac696 100644
--- a/pkgs/development/tools/misc/yodl/default.nix
+++ b/pkgs/development/tools/misc/yodl/default.nix
@@ -15,7 +15,9 @@ stdenv.mkDerivation rec {
     owner = "fbb-git";
   };
 
-  sourceRoot = "yodl-${version}-src/yodl";
+  setSourceRoot = ''
+    sourceRoot=$(echo */yodl)
+  '';
 
   preConfigure = ''
     patchShebangs ./build
diff --git a/pkgs/development/tools/parsing/flexc++/default.nix b/pkgs/development/tools/parsing/flexc++/default.nix
index 7fb1289b7eb..c782df50758 100644
--- a/pkgs/development/tools/parsing/flexc++/default.nix
+++ b/pkgs/development/tools/parsing/flexc++/default.nix
@@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
     owner = "fbb-git";
   };
 
-  sourceRoot = "flexcpp-${version}-src/flexc++";
+  setSourceRoot = ''
+    sourceRoot=$(echo */flexc++)
+  '';
 
   buildInputs = [ bobcat ];
   nativeBuildInputs = [ icmake yodl ];
diff --git a/pkgs/os-specific/linux/jool/cli.nix b/pkgs/os-specific/linux/jool/cli.nix
index 43edd8723a0..50f0398e134 100644
--- a/pkgs/os-specific/linux/jool/cli.nix
+++ b/pkgs/os-specific/linux/jool/cli.nix
@@ -9,7 +9,9 @@ stdenv.mkDerivation {
 
   src = sourceAttrs.src;
 
-  sourceRoot = "Jool-v${sourceAttrs.version}-src/usr";
+  setSourceRoot = ''
+    sourceRoot=$(echo */usr)
+  '';
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [ libnl ];
diff --git a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix
index 61de807d8e8..5768e7badea 100644
--- a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix
+++ b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix
@@ -10,7 +10,9 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--with-apxs=${apacheHttpd.dev}/bin/apxs --with-java-home=${jdk}";
 
-  sourceRoot = "${name}-src/native";
+  setSourceRoot = ''
+    sourceRoot=$(echo */native)
+  '';
 
   installPhase = ''
     mkdir -p $out/modules
diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix
index 0da3ff45a8c..7deac71f151 100644
--- a/pkgs/tools/cd-dvd/unetbootin/default.nix
+++ b/pkgs/tools/cd-dvd/unetbootin/default.nix
@@ -12,7 +12,9 @@ stdenv.mkDerivation rec {
     sha256 = "18bbcrjk6ladr46kl3dvqz5pq2xcv4nnwmajqllb4sl3k1xqsngy";
   };
 
-  sourceRoot = "source/src/unetbootin";
+  setSourceRoot = ''
+    sourceRoot=$(echo */src/unetbootin)
+  '';
 
   buildInputs = [ qt4 ];
   nativeBuildInputs = [ makeWrapper qmake4Hook ];
diff --git a/pkgs/tools/compression/zstdmt/default.nix b/pkgs/tools/compression/zstdmt/default.nix
index 5cf88e68c64..b723c107936 100644
--- a/pkgs/tools/compression/zstdmt/default.nix
+++ b/pkgs/tools/compression/zstdmt/default.nix
@@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
     owner = "mcmilk";
   };
 
-  sourceRoot = "zstdmt-v${version}-src/unix";
+  setSourceRoot = ''
+    sourceRoot=$(echo */unix)
+  '';
 
   buildInputs = [
     zstd lz4
diff --git a/pkgs/tools/inputmethods/zinnia/default.nix b/pkgs/tools/inputmethods/zinnia/default.nix
index 18e6176b706..60f3a0feb55 100644
--- a/pkgs/tools/inputmethods/zinnia/default.nix
+++ b/pkgs/tools/inputmethods/zinnia/default.nix
@@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
     sha256 = "1izjy5qw6swg0rs2ym2i72zndb90mwrfbd1iv8xbpwckbm4899lg";
   };
 
-  setSourceRoot = "export sourceRoot=$(echo zinnia-*/zinnia/)";
+  setSourceRoot = ''
+    sourceRoot=$(echo */zinnia)
+  '';
 
   meta = with stdenv.lib; {
     description = "Online hand recognition system with machine learning";
diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix
index e303b1dd7f2..a1c04f06d14 100644
--- a/pkgs/tools/misc/cloc/default.nix
+++ b/pkgs/tools/misc/cloc/default.nix
@@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
     sha256 = "1ihma4f6f92jp1mvzr4rjrgyh9m5wzrlxngaxfn7g0a8r2kyi65b";
   };
 
-  sourceRoot = "source/Unix";
+  setSourceRoot = ''
+    sourceRoot=$(echo */Unix)
+  '';
 
   buildInputs = [ makeWrapper perl AlgorithmDiff RegexpCommon ];
 
diff --git a/pkgs/tools/networking/reaver-wps/default.nix b/pkgs/tools/networking/reaver-wps/default.nix
index c9bd3fbaa85..667cbfbcead 100644
--- a/pkgs/tools/networking/reaver-wps/default.nix
+++ b/pkgs/tools/networking/reaver-wps/default.nix
@@ -13,7 +13,10 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ libpcap sqlite ];
 
-  sourceRoot = "reaver-${version}/src";
+
+  setSourceRoot = ''
+    sourceRoot=$(echo */src)
+  '';
 
   configureFlags = "--sysconfdir=${confdir}";
 
diff --git a/pkgs/tools/text/zimreader/default.nix b/pkgs/tools/text/zimreader/default.nix
index 1c508a9cf7e..f9debaaf061 100644
--- a/pkgs/tools/text/zimreader/default.nix
+++ b/pkgs/tools/text/zimreader/default.nix
@@ -23,7 +23,9 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
   buildInputs = [ automake autoconf libtool zimlib cxxtools tntnet ];
-  setSourceRoot = "cd openzim-*/zimreader; export sourceRoot=`pwd`";
+  setSourceRoot = ''
+    sourceRoot=$(echo */zimreader)
+  '';
   preConfigure = "./autogen.sh";
 
   meta = {
diff --git a/pkgs/tools/text/zimwriterfs/default.nix b/pkgs/tools/text/zimwriterfs/default.nix
index 6fcbf5061d1..5a5757bf2f2 100644
--- a/pkgs/tools/text/zimwriterfs/default.nix
+++ b/pkgs/tools/text/zimwriterfs/default.nix
@@ -28,7 +28,9 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ automake autoconf libtool pkgconfig ];
   buildInputs = [ file icu libgumbo lzma zimlib zlib xapian ];
-  setSourceRoot = "cd openzim-*/zimwriterfs; export sourceRoot=`pwd`";
+  setSourceRoot = ''
+    sourceRoot=$(echo */zimwriterfs)
+  '';
   preConfigure = "./autogen.sh";
 
   meta = {