lol

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

+72 -24
+3 -1
pkgs/applications/audio/puddletag/default.nix
··· 11 sha256 = "1g6wa91awy17z5b704yi9kfynnvfm9lkrvpfvwccscr1h8s3qmiz"; 12 }; 13 14 - sourceRoot = "source/source"; 15 16 disabled = python2Packages.isPy3k; # work to support python 3 has not begun 17
··· 11 sha256 = "1g6wa91awy17z5b704yi9kfynnvfm9lkrvpfvwccscr1h8s3qmiz"; 12 }; 13 14 + setSourceRoot = '' 15 + sourceRoot=$(echo */source) 16 + ''; 17 18 disabled = python2Packages.isPy3k; # work to support python 3 has not begun 19
+3 -1
pkgs/applications/graphics/nomacs/default.nix
··· 30 31 enableParallelBuilding = true; 32 33 - sourceRoot = "${name}-src/ImageLounge"; 34 35 patches = [./fix-appdata-install.patch]; 36
··· 30 31 enableParallelBuilding = true; 32 33 + setSourceRoot = '' 34 + sourceRoot=$(echo */ImageLounge) 35 + ''; 36 37 patches = [./fix-appdata-install.patch]; 38
+3 -1
pkgs/applications/graphics/screencloud/default.nix
··· 43 "-DCONSUMER_SECRET_SCREENCLOUD=${consumerSecret}" 44 ]; 45 46 - sourceRoot = "screencloud-v${version}-src/screencloud"; 47 48 preConfigure = '' 49 # This needs to be set in preConfigure instead of cmakeFlags in order to
··· 43 "-DCONSUMER_SECRET_SCREENCLOUD=${consumerSecret}" 44 ]; 45 46 + setSourceRoot = '' 47 + sourceRoot=$(echo */screencloud) 48 + ''; 49 50 preConfigure = '' 51 # This needs to be set in preConfigure instead of cmakeFlags in order to
+3 -1
pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix
··· 11 sha256 = "1lxpz316jmns6i143v4j6sd6k0a4a54alw08rvwjckf2rig57lj2"; 12 }; 13 14 - sourceRoot = "skype4pidgin-${version}-src/skypeweb"; 15 16 nativeBuildInputs = [ pkgconfig ]; 17 buildInputs = [ pidgin json_glib ];
··· 11 sha256 = "1lxpz316jmns6i143v4j6sd6k0a4a54alw08rvwjckf2rig57lj2"; 12 }; 13 14 + setSourceRoot = '' 15 + sourceRoot=$(echo */skypeweb) 16 + ''; 17 18 nativeBuildInputs = [ pkgconfig ]; 19 buildInputs = [ pidgin json_glib ];
+3 -1
pkgs/applications/science/misc/golly/default.nix
··· 20 inherit (s) url sha256; 21 }; 22 23 - sourceRoot="${name}-src/gui-wx/configure"; 24 25 # Link against Python explicitly as it is needed for scripts 26 makeFlags=[
··· 20 inherit (s) url sha256; 21 }; 22 23 + setSourceRoot = '' 24 + sourceRoot=$(echo */gui-wx/configure) 25 + ''; 26 27 # Link against Python explicitly as it is needed for scripts 28 makeFlags=[
+3
pkgs/development/compilers/dmd/2.067.1.nix
··· 17 repo = "dmd"; 18 rev = "v${version}"; 19 sha256 = "0fm29lg8axfmzdaj0y6vg70lhwb5d9rv4aavnvdd15xjschinlcz"; 20 }) 21 (fetchFromGitHub { 22 owner = "dlang"; 23 repo = "druntime"; 24 rev = "v${version}"; 25 sha256 = "1n2qfw9kmnql0fk2nxikispqs7vh85nhvyyr00fk227n9lgnqf02"; 26 }) 27 (fetchFromGitHub { 28 owner = "dlang"; 29 repo = "phobos"; 30 rev = "v${version}"; 31 sha256 = "0fywgds9xvjcgnqxmpwr67p3wi2m535619pvj159cgwv5y0nr3p1"; 32 }) 33 ]; 34
··· 17 repo = "dmd"; 18 rev = "v${version}"; 19 sha256 = "0fm29lg8axfmzdaj0y6vg70lhwb5d9rv4aavnvdd15xjschinlcz"; 20 + name = "dmd-v${version}-src"; 21 }) 22 (fetchFromGitHub { 23 owner = "dlang"; 24 repo = "druntime"; 25 rev = "v${version}"; 26 sha256 = "1n2qfw9kmnql0fk2nxikispqs7vh85nhvyyr00fk227n9lgnqf02"; 27 + name = "druntime-v${version}-src"; 28 }) 29 (fetchFromGitHub { 30 owner = "dlang"; 31 repo = "phobos"; 32 rev = "v${version}"; 33 sha256 = "0fywgds9xvjcgnqxmpwr67p3wi2m535619pvj159cgwv5y0nr3p1"; 34 + name = "phobos-v${version}-src"; 35 }) 36 ]; 37
+3
pkgs/development/compilers/dmd/default.nix
··· 14 repo = "dmd"; 15 rev = "v${version}"; 16 sha256 = "0kq6r8rcghvzk5jcphg89l85rg734s29bssd2rcw3fygx0k9a9k5"; 17 }) 18 (fetchFromGitHub { 19 owner = "dlang"; 20 repo = "druntime"; 21 rev = "v${version}"; 22 sha256 = "0idn2v1lmp7hl637g3i7pdfj9mjk4sclkz4cm77nl8873k2fhk8j"; 23 }) 24 (fetchFromGitHub { 25 owner = "dlang"; 26 repo = "phobos"; 27 rev = "v${version}"; 28 sha256 = "1a7q5fd15yspgs5plxgx54jyrcwgzlyw3rahmz04jd2s5h56dj04"; 29 }) 30 ]; 31
··· 14 repo = "dmd"; 15 rev = "v${version}"; 16 sha256 = "0kq6r8rcghvzk5jcphg89l85rg734s29bssd2rcw3fygx0k9a9k5"; 17 + name = "dmd-v${version}-src"; 18 }) 19 (fetchFromGitHub { 20 owner = "dlang"; 21 repo = "druntime"; 22 rev = "v${version}"; 23 sha256 = "0idn2v1lmp7hl637g3i7pdfj9mjk4sclkz4cm77nl8873k2fhk8j"; 24 + name = "druntime-v${version}-src"; 25 }) 26 (fetchFromGitHub { 27 owner = "dlang"; 28 repo = "phobos"; 29 rev = "v${version}"; 30 sha256 = "1a7q5fd15yspgs5plxgx54jyrcwgzlyw3rahmz04jd2s5h56dj04"; 31 + name = "phobos-v${version}-src"; 32 }) 33 ]; 34
+4
pkgs/development/compilers/ldc/default.nix
··· 11 repo = "ldc"; 12 rev = "v${version}"; 13 sha256 = "1ac3j4cwwgjpayhijxx4d6478bc3iqksjxkd7xp7byx7k8w1ppdl"; 14 }) 15 (fetchFromGitHub { 16 owner = "ldc-developers"; 17 repo = "druntime"; 18 rev = "ldc-v${version}"; 19 sha256 = "1m13370wnj3sizqk3sdpzi9am5d24srf27d613qblhqa9n8vwz30"; 20 }) 21 (fetchFromGitHub { 22 owner = "ldc-developers"; 23 repo = "phobos"; 24 rev = "ldc-v${version}"; 25 sha256 = "0fhcdfi7a00plwj27ysfyv783nhk0kspq7hawf6vbsl3s1nyvn8g"; 26 }) 27 (fetchFromGitHub { 28 owner = "ldc-developers"; 29 repo = "dmd-testsuite"; 30 rev = "ldc-v${version}"; 31 sha256 = "0dmdkp220gqhxjrmrjfkf0vsvylwfaj70hswavq4q3v4dg17pzmj"; 32 }) 33 ]; 34
··· 11 repo = "ldc"; 12 rev = "v${version}"; 13 sha256 = "1ac3j4cwwgjpayhijxx4d6478bc3iqksjxkd7xp7byx7k8w1ppdl"; 14 + name = "ldc-v${version}-src"; 15 }) 16 (fetchFromGitHub { 17 owner = "ldc-developers"; 18 repo = "druntime"; 19 rev = "ldc-v${version}"; 20 sha256 = "1m13370wnj3sizqk3sdpzi9am5d24srf27d613qblhqa9n8vwz30"; 21 + name = "druntime-ldc-v${version}-src"; 22 }) 23 (fetchFromGitHub { 24 owner = "ldc-developers"; 25 repo = "phobos"; 26 rev = "ldc-v${version}"; 27 sha256 = "0fhcdfi7a00plwj27ysfyv783nhk0kspq7hawf6vbsl3s1nyvn8g"; 28 + name = "phobos-ldc-v${version}-src"; 29 }) 30 (fetchFromGitHub { 31 owner = "ldc-developers"; 32 repo = "dmd-testsuite"; 33 rev = "ldc-v${version}"; 34 sha256 = "0dmdkp220gqhxjrmrjfkf0vsvylwfaj70hswavq4q3v4dg17pzmj"; 35 + name = "dmd-testsuite-ldc-v${version}-src"; 36 }) 37 ]; 38
+3 -1
pkgs/development/libraries/bobcat/default.nix
··· 16 buildInputs = [ libmilter libX11 openssl readline utillinux ]; 17 nativeBuildInputs = [ icmake yodl ]; 18 19 - sourceRoot = "bobcat-${version}-src/bobcat"; 20 21 postPatch = '' 22 substituteInPlace INSTALL.im --replace /usr $out
··· 16 buildInputs = [ libmilter libX11 openssl readline utillinux ]; 17 nativeBuildInputs = [ icmake yodl ]; 18 19 + setSourceRoot = '' 20 + sourceRoot=$(echo */bobcat) 21 + ''; 22 23 postPatch = '' 24 substituteInPlace INSTALL.im --replace /usr $out
+3 -1
pkgs/development/libraries/cxxtest/default.nix
··· 13 sha256 = "19w92kipfhp5wvs47l0qpibn3x49sbmvkk91yxw6nwk6fafcdl17"; 14 }; 15 16 - sourceRoot = "${name}-src/python"; 17 18 meta = with stdenv.lib; { 19 homepage = http://cxxtest.com;
··· 13 sha256 = "19w92kipfhp5wvs47l0qpibn3x49sbmvkk91yxw6nwk6fafcdl17"; 14 }; 15 16 + setSourceRoot = '' 17 + sourceRoot=$(echo */python) 18 + ''; 19 20 meta = with stdenv.lib; { 21 homepage = http://cxxtest.com;
+3 -1
pkgs/development/libraries/openvdb/default.nix
··· 16 17 buildInputs = [ unzip openexr boost tbb jemalloc c-blosc ilmbase ]; 18 19 - sourceRoot = "openvdb-v${version}-src/openvdb"; 20 21 installTargets = "install_lib"; 22
··· 16 17 buildInputs = [ unzip openexr boost tbb jemalloc c-blosc ilmbase ]; 18 19 + setSourceRoot = '' 20 + sourceRoot=$(echo */openvdb) 21 + ''; 22 23 installTargets = "install_lib"; 24
-2
pkgs/development/libraries/partio/default.nix
··· 16 17 buildInputs = [ unzip cmake freeglut mesa zlib swig python doxygen xorg.libXi xorg.libXmu ]; 18 19 - sourceRoot = "partio-v${version}-src"; 20 - 21 enableParallelBuilding = true; 22 23 buildPhase = ''
··· 16 17 buildInputs = [ unzip cmake freeglut mesa zlib swig python doxygen xorg.libXi xorg.libXmu ]; 18 19 enableParallelBuilding = true; 20 21 buildPhase = ''
-2
pkgs/development/libraries/ptex/default.nix
··· 16 17 buildInputs = [ zlib python cmake ]; 18 19 - sourceRoot = "ptex-v${version}-src"; 20 - 21 enableParallelBuilding = true; 22 23 buildPhase = ''
··· 16 17 buildInputs = [ zlib python cmake ]; 18 19 enableParallelBuilding = true; 20 21 buildPhase = ''
+4 -1
pkgs/development/tools/build-managers/icmake/default.nix
··· 11 owner = "fbb-git"; 12 }; 13 14 - sourceRoot = "icmake-${version}-src/icmake"; 15 16 buildInputs = [ gcc ]; 17
··· 11 owner = "fbb-git"; 12 }; 13 14 + 15 + setSourceRoot = '' 16 + sourceRoot=$(echo */icmake) 17 + ''; 18 19 buildInputs = [ gcc ]; 20
+3 -1
pkgs/development/tools/misc/yodl/default.nix
··· 15 owner = "fbb-git"; 16 }; 17 18 - sourceRoot = "yodl-${version}-src/yodl"; 19 20 preConfigure = '' 21 patchShebangs ./build
··· 15 owner = "fbb-git"; 16 }; 17 18 + setSourceRoot = '' 19 + sourceRoot=$(echo */yodl) 20 + ''; 21 22 preConfigure = '' 23 patchShebangs ./build
+3 -1
pkgs/development/tools/parsing/flexc++/default.nix
··· 11 owner = "fbb-git"; 12 }; 13 14 - sourceRoot = "flexcpp-${version}-src/flexc++"; 15 16 buildInputs = [ bobcat ]; 17 nativeBuildInputs = [ icmake yodl ];
··· 11 owner = "fbb-git"; 12 }; 13 14 + setSourceRoot = '' 15 + sourceRoot=$(echo */flexc++) 16 + ''; 17 18 buildInputs = [ bobcat ]; 19 nativeBuildInputs = [ icmake yodl ];
+3 -1
pkgs/os-specific/linux/jool/cli.nix
··· 9 10 src = sourceAttrs.src; 11 12 - sourceRoot = "Jool-v${sourceAttrs.version}-src/usr"; 13 14 nativeBuildInputs = [ autoreconfHook pkgconfig ]; 15 buildInputs = [ libnl ];
··· 9 10 src = sourceAttrs.src; 11 12 + setSourceRoot = '' 13 + sourceRoot=$(echo */usr) 14 + ''; 15 16 nativeBuildInputs = [ autoreconfHook pkgconfig ]; 17 buildInputs = [ libnl ];
+3 -1
pkgs/servers/http/apache-modules/tomcat-connectors/default.nix
··· 10 11 configureFlags = "--with-apxs=${apacheHttpd.dev}/bin/apxs --with-java-home=${jdk}"; 12 13 - sourceRoot = "${name}-src/native"; 14 15 installPhase = '' 16 mkdir -p $out/modules
··· 10 11 configureFlags = "--with-apxs=${apacheHttpd.dev}/bin/apxs --with-java-home=${jdk}"; 12 13 + setSourceRoot = '' 14 + sourceRoot=$(echo */native) 15 + ''; 16 17 installPhase = '' 18 mkdir -p $out/modules
+3 -1
pkgs/tools/cd-dvd/unetbootin/default.nix
··· 12 sha256 = "18bbcrjk6ladr46kl3dvqz5pq2xcv4nnwmajqllb4sl3k1xqsngy"; 13 }; 14 15 - sourceRoot = "source/src/unetbootin"; 16 17 buildInputs = [ qt4 ]; 18 nativeBuildInputs = [ makeWrapper qmake4Hook ];
··· 12 sha256 = "18bbcrjk6ladr46kl3dvqz5pq2xcv4nnwmajqllb4sl3k1xqsngy"; 13 }; 14 15 + setSourceRoot = '' 16 + sourceRoot=$(echo */src/unetbootin) 17 + ''; 18 19 buildInputs = [ qt4 ]; 20 nativeBuildInputs = [ makeWrapper qmake4Hook ];
+3 -1
pkgs/tools/compression/zstdmt/default.nix
··· 11 owner = "mcmilk"; 12 }; 13 14 - sourceRoot = "zstdmt-v${version}-src/unix"; 15 16 buildInputs = [ 17 zstd lz4
··· 11 owner = "mcmilk"; 12 }; 13 14 + setSourceRoot = '' 15 + sourceRoot=$(echo */unix) 16 + ''; 17 18 buildInputs = [ 19 zstd lz4
+3 -1
pkgs/tools/inputmethods/zinnia/default.nix
··· 11 sha256 = "1izjy5qw6swg0rs2ym2i72zndb90mwrfbd1iv8xbpwckbm4899lg"; 12 }; 13 14 - setSourceRoot = "export sourceRoot=$(echo zinnia-*/zinnia/)"; 15 16 meta = with stdenv.lib; { 17 description = "Online hand recognition system with machine learning";
··· 11 sha256 = "1izjy5qw6swg0rs2ym2i72zndb90mwrfbd1iv8xbpwckbm4899lg"; 12 }; 13 14 + setSourceRoot = '' 15 + sourceRoot=$(echo */zinnia) 16 + ''; 17 18 meta = with stdenv.lib; { 19 description = "Online hand recognition system with machine learning";
+3 -1
pkgs/tools/misc/cloc/default.nix
··· 11 sha256 = "1ihma4f6f92jp1mvzr4rjrgyh9m5wzrlxngaxfn7g0a8r2kyi65b"; 12 }; 13 14 - sourceRoot = "source/Unix"; 15 16 buildInputs = [ makeWrapper perl AlgorithmDiff RegexpCommon ]; 17
··· 11 sha256 = "1ihma4f6f92jp1mvzr4rjrgyh9m5wzrlxngaxfn7g0a8r2kyi65b"; 12 }; 13 14 + setSourceRoot = '' 15 + sourceRoot=$(echo */Unix) 16 + ''; 17 18 buildInputs = [ makeWrapper perl AlgorithmDiff RegexpCommon ]; 19
+4 -1
pkgs/tools/networking/reaver-wps/default.nix
··· 13 nativeBuildInputs = [ makeWrapper ]; 14 buildInputs = [ libpcap sqlite ]; 15 16 - sourceRoot = "reaver-${version}/src"; 17 18 configureFlags = "--sysconfdir=${confdir}"; 19
··· 13 nativeBuildInputs = [ makeWrapper ]; 14 buildInputs = [ libpcap sqlite ]; 15 16 + 17 + setSourceRoot = '' 18 + sourceRoot=$(echo */src) 19 + ''; 20 21 configureFlags = "--sysconfdir=${confdir}"; 22
+3 -1
pkgs/tools/text/zimreader/default.nix
··· 23 24 enableParallelBuilding = true; 25 buildInputs = [ automake autoconf libtool zimlib cxxtools tntnet ]; 26 - setSourceRoot = "cd openzim-*/zimreader; export sourceRoot=`pwd`"; 27 preConfigure = "./autogen.sh"; 28 29 meta = {
··· 23 24 enableParallelBuilding = true; 25 buildInputs = [ automake autoconf libtool zimlib cxxtools tntnet ]; 26 + setSourceRoot = '' 27 + sourceRoot=$(echo */zimreader) 28 + ''; 29 preConfigure = "./autogen.sh"; 30 31 meta = {
+3 -1
pkgs/tools/text/zimwriterfs/default.nix
··· 28 29 nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; 30 buildInputs = [ file icu libgumbo lzma zimlib zlib xapian ]; 31 - setSourceRoot = "cd openzim-*/zimwriterfs; export sourceRoot=`pwd`"; 32 preConfigure = "./autogen.sh"; 33 34 meta = {
··· 28 29 nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; 30 buildInputs = [ file icu libgumbo lzma zimlib zlib xapian ]; 31 + setSourceRoot = '' 32 + sourceRoot=$(echo */zimwriterfs) 33 + ''; 34 preConfigure = "./autogen.sh"; 35 36 meta = {