Merge pull request #31132 from pbogdan/sourceroot-fixes

fix source root locations after c3255fe8ec
2017-11-02 15:18:25 +00:00 · 2017-11-02 15:18:25 +00:00 · 672efa467d
commit 672efa467d
parent 7c8ec77db2 8904ce343a
25 changed files with 72 additions and 24 deletions
--- 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

--- 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];

--- 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
--- 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 ];
--- 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=[
--- 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";
  })
  ];

--- 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";
  })
  ];

--- 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";
  })
  ];

--- 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
--- 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;
--- 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";

--- 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 = ''
--- 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 = ''
--- 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 ];

--- 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
--- 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 ];
--- 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 ];
--- 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
--- 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 ];
--- 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
--- 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";
--- 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 ];

--- 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}";

--- 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 = {
--- 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 = {