3
0
Fork 0
forked from mirrors/nixpkgs

fix source root locations.

These have changed following commit
c3255fe8ec.

See also:

- https://github.com/NixOS/nixpkgs/pull/31004
- https://github.com/NixOS/nixpkgs/pull/31106
This commit is contained in:
Piotr Bogdan 2017-11-02 12:54:20 +00:00
parent 7f921735e7
commit 8904ce343a
25 changed files with 72 additions and 24 deletions
pkgs
applications
audio/puddletag
graphics
nomacs
screencloud
networking/instant-messengers/pidgin-plugins/pidgin-skypeweb
science/misc/golly
development
compilers
libraries
tools
build-managers/icmake
misc/yodl
parsing/flexc++
os-specific/linux/jool
servers/http/apache-modules/tomcat-connectors
tools
cd-dvd/unetbootin
compression/zstdmt
inputmethods/zinnia
misc/cloc
networking/reaver-wps
text
zimreader
zimwriterfs

View file

@ -11,7 +11,9 @@ python2Packages.buildPythonApplication rec {
sha256 = "1g6wa91awy17z5b704yi9kfynnvfm9lkrvpfvwccscr1h8s3qmiz"; sha256 = "1g6wa91awy17z5b704yi9kfynnvfm9lkrvpfvwccscr1h8s3qmiz";
}; };
sourceRoot = "source/source"; setSourceRoot = ''
sourceRoot=$(echo */source)
'';
disabled = python2Packages.isPy3k; # work to support python 3 has not begun disabled = python2Packages.isPy3k; # work to support python 3 has not begun

View file

@ -30,7 +30,9 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
sourceRoot = "${name}-src/ImageLounge"; setSourceRoot = ''
sourceRoot=$(echo */ImageLounge)
'';
patches = [./fix-appdata-install.patch]; patches = [./fix-appdata-install.patch];

View file

@ -43,7 +43,9 @@ stdenv.mkDerivation rec {
"-DCONSUMER_SECRET_SCREENCLOUD=${consumerSecret}" "-DCONSUMER_SECRET_SCREENCLOUD=${consumerSecret}"
]; ];
sourceRoot = "screencloud-v${version}-src/screencloud"; setSourceRoot = ''
sourceRoot=$(echo */screencloud)
'';
preConfigure = '' preConfigure = ''
# This needs to be set in preConfigure instead of cmakeFlags in order to # This needs to be set in preConfigure instead of cmakeFlags in order to

View file

@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
sha256 = "1lxpz316jmns6i143v4j6sd6k0a4a54alw08rvwjckf2rig57lj2"; sha256 = "1lxpz316jmns6i143v4j6sd6k0a4a54alw08rvwjckf2rig57lj2";
}; };
sourceRoot = "skype4pidgin-${version}-src/skypeweb"; setSourceRoot = ''
sourceRoot=$(echo */skypeweb)
'';
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ pidgin json_glib ]; buildInputs = [ pidgin json_glib ];

View file

@ -20,7 +20,9 @@ stdenv.mkDerivation rec {
inherit (s) url sha256; 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 # Link against Python explicitly as it is needed for scripts
makeFlags=[ makeFlags=[

View file

@ -17,18 +17,21 @@ stdenv.mkDerivation rec {
repo = "dmd"; repo = "dmd";
rev = "v${version}"; rev = "v${version}";
sha256 = "0fm29lg8axfmzdaj0y6vg70lhwb5d9rv4aavnvdd15xjschinlcz"; sha256 = "0fm29lg8axfmzdaj0y6vg70lhwb5d9rv4aavnvdd15xjschinlcz";
name = "dmd-v${version}-src";
}) })
(fetchFromGitHub { (fetchFromGitHub {
owner = "dlang"; owner = "dlang";
repo = "druntime"; repo = "druntime";
rev = "v${version}"; rev = "v${version}";
sha256 = "1n2qfw9kmnql0fk2nxikispqs7vh85nhvyyr00fk227n9lgnqf02"; sha256 = "1n2qfw9kmnql0fk2nxikispqs7vh85nhvyyr00fk227n9lgnqf02";
name = "druntime-v${version}-src";
}) })
(fetchFromGitHub { (fetchFromGitHub {
owner = "dlang"; owner = "dlang";
repo = "phobos"; repo = "phobos";
rev = "v${version}"; rev = "v${version}";
sha256 = "0fywgds9xvjcgnqxmpwr67p3wi2m535619pvj159cgwv5y0nr3p1"; sha256 = "0fywgds9xvjcgnqxmpwr67p3wi2m535619pvj159cgwv5y0nr3p1";
name = "phobos-v${version}-src";
}) })
]; ];

View file

@ -14,18 +14,21 @@ stdenv.mkDerivation rec {
repo = "dmd"; repo = "dmd";
rev = "v${version}"; rev = "v${version}";
sha256 = "0kq6r8rcghvzk5jcphg89l85rg734s29bssd2rcw3fygx0k9a9k5"; sha256 = "0kq6r8rcghvzk5jcphg89l85rg734s29bssd2rcw3fygx0k9a9k5";
name = "dmd-v${version}-src";
}) })
(fetchFromGitHub { (fetchFromGitHub {
owner = "dlang"; owner = "dlang";
repo = "druntime"; repo = "druntime";
rev = "v${version}"; rev = "v${version}";
sha256 = "0idn2v1lmp7hl637g3i7pdfj9mjk4sclkz4cm77nl8873k2fhk8j"; sha256 = "0idn2v1lmp7hl637g3i7pdfj9mjk4sclkz4cm77nl8873k2fhk8j";
name = "druntime-v${version}-src";
}) })
(fetchFromGitHub { (fetchFromGitHub {
owner = "dlang"; owner = "dlang";
repo = "phobos"; repo = "phobos";
rev = "v${version}"; rev = "v${version}";
sha256 = "1a7q5fd15yspgs5plxgx54jyrcwgzlyw3rahmz04jd2s5h56dj04"; sha256 = "1a7q5fd15yspgs5plxgx54jyrcwgzlyw3rahmz04jd2s5h56dj04";
name = "phobos-v${version}-src";
}) })
]; ];

View file

@ -11,24 +11,28 @@ stdenv.mkDerivation rec {
repo = "ldc"; repo = "ldc";
rev = "v${version}"; rev = "v${version}";
sha256 = "1ac3j4cwwgjpayhijxx4d6478bc3iqksjxkd7xp7byx7k8w1ppdl"; sha256 = "1ac3j4cwwgjpayhijxx4d6478bc3iqksjxkd7xp7byx7k8w1ppdl";
name = "ldc-v${version}-src";
}) })
(fetchFromGitHub { (fetchFromGitHub {
owner = "ldc-developers"; owner = "ldc-developers";
repo = "druntime"; repo = "druntime";
rev = "ldc-v${version}"; rev = "ldc-v${version}";
sha256 = "1m13370wnj3sizqk3sdpzi9am5d24srf27d613qblhqa9n8vwz30"; sha256 = "1m13370wnj3sizqk3sdpzi9am5d24srf27d613qblhqa9n8vwz30";
name = "druntime-ldc-v${version}-src";
}) })
(fetchFromGitHub { (fetchFromGitHub {
owner = "ldc-developers"; owner = "ldc-developers";
repo = "phobos"; repo = "phobos";
rev = "ldc-v${version}"; rev = "ldc-v${version}";
sha256 = "0fhcdfi7a00plwj27ysfyv783nhk0kspq7hawf6vbsl3s1nyvn8g"; sha256 = "0fhcdfi7a00plwj27ysfyv783nhk0kspq7hawf6vbsl3s1nyvn8g";
name = "phobos-ldc-v${version}-src";
}) })
(fetchFromGitHub { (fetchFromGitHub {
owner = "ldc-developers"; owner = "ldc-developers";
repo = "dmd-testsuite"; repo = "dmd-testsuite";
rev = "ldc-v${version}"; rev = "ldc-v${version}";
sha256 = "0dmdkp220gqhxjrmrjfkf0vsvylwfaj70hswavq4q3v4dg17pzmj"; sha256 = "0dmdkp220gqhxjrmrjfkf0vsvylwfaj70hswavq4q3v4dg17pzmj";
name = "dmd-testsuite-ldc-v${version}-src";
}) })
]; ];

View file

@ -16,7 +16,9 @@ stdenv.mkDerivation rec {
buildInputs = [ libmilter libX11 openssl readline utillinux ]; buildInputs = [ libmilter libX11 openssl readline utillinux ];
nativeBuildInputs = [ icmake yodl ]; nativeBuildInputs = [ icmake yodl ];
sourceRoot = "bobcat-${version}-src/bobcat"; setSourceRoot = ''
sourceRoot=$(echo */bobcat)
'';
postPatch = '' postPatch = ''
substituteInPlace INSTALL.im --replace /usr $out substituteInPlace INSTALL.im --replace /usr $out

View file

@ -13,7 +13,9 @@ in python2Packages.buildPythonApplication rec {
sha256 = "19w92kipfhp5wvs47l0qpibn3x49sbmvkk91yxw6nwk6fafcdl17"; sha256 = "19w92kipfhp5wvs47l0qpibn3x49sbmvkk91yxw6nwk6fafcdl17";
}; };
sourceRoot = "${name}-src/python"; setSourceRoot = ''
sourceRoot=$(echo */python)
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://cxxtest.com; homepage = http://cxxtest.com;

View file

@ -16,7 +16,9 @@ stdenv.mkDerivation rec
buildInputs = [ unzip openexr boost tbb jemalloc c-blosc ilmbase ]; buildInputs = [ unzip openexr boost tbb jemalloc c-blosc ilmbase ];
sourceRoot = "openvdb-v${version}-src/openvdb"; setSourceRoot = ''
sourceRoot=$(echo */openvdb)
'';
installTargets = "install_lib"; installTargets = "install_lib";

View file

@ -16,8 +16,6 @@ stdenv.mkDerivation rec
buildInputs = [ unzip cmake freeglut mesa zlib swig python doxygen xorg.libXi xorg.libXmu ]; buildInputs = [ unzip cmake freeglut mesa zlib swig python doxygen xorg.libXi xorg.libXmu ];
sourceRoot = "partio-v${version}-src";
enableParallelBuilding = true; enableParallelBuilding = true;
buildPhase = '' buildPhase = ''

View file

@ -16,8 +16,6 @@ stdenv.mkDerivation rec
buildInputs = [ zlib python cmake ]; buildInputs = [ zlib python cmake ];
sourceRoot = "ptex-v${version}-src";
enableParallelBuilding = true; enableParallelBuilding = true;
buildPhase = '' buildPhase = ''

View file

@ -11,7 +11,10 @@ stdenv.mkDerivation rec {
owner = "fbb-git"; owner = "fbb-git";
}; };
sourceRoot = "icmake-${version}-src/icmake";
setSourceRoot = ''
sourceRoot=$(echo */icmake)
'';
buildInputs = [ gcc ]; buildInputs = [ gcc ];

View file

@ -15,7 +15,9 @@ stdenv.mkDerivation rec {
owner = "fbb-git"; owner = "fbb-git";
}; };
sourceRoot = "yodl-${version}-src/yodl"; setSourceRoot = ''
sourceRoot=$(echo */yodl)
'';
preConfigure = '' preConfigure = ''
patchShebangs ./build patchShebangs ./build

View file

@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
owner = "fbb-git"; owner = "fbb-git";
}; };
sourceRoot = "flexcpp-${version}-src/flexc++"; setSourceRoot = ''
sourceRoot=$(echo */flexc++)
'';
buildInputs = [ bobcat ]; buildInputs = [ bobcat ];
nativeBuildInputs = [ icmake yodl ]; nativeBuildInputs = [ icmake yodl ];

View file

@ -9,7 +9,9 @@ stdenv.mkDerivation {
src = sourceAttrs.src; src = sourceAttrs.src;
sourceRoot = "Jool-v${sourceAttrs.version}-src/usr"; setSourceRoot = ''
sourceRoot=$(echo */usr)
'';
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ libnl ]; buildInputs = [ libnl ];

View file

@ -10,7 +10,9 @@ stdenv.mkDerivation rec {
configureFlags = "--with-apxs=${apacheHttpd.dev}/bin/apxs --with-java-home=${jdk}"; configureFlags = "--with-apxs=${apacheHttpd.dev}/bin/apxs --with-java-home=${jdk}";
sourceRoot = "${name}-src/native"; setSourceRoot = ''
sourceRoot=$(echo */native)
'';
installPhase = '' installPhase = ''
mkdir -p $out/modules mkdir -p $out/modules

View file

@ -12,7 +12,9 @@ stdenv.mkDerivation rec {
sha256 = "18bbcrjk6ladr46kl3dvqz5pq2xcv4nnwmajqllb4sl3k1xqsngy"; sha256 = "18bbcrjk6ladr46kl3dvqz5pq2xcv4nnwmajqllb4sl3k1xqsngy";
}; };
sourceRoot = "source/src/unetbootin"; setSourceRoot = ''
sourceRoot=$(echo */src/unetbootin)
'';
buildInputs = [ qt4 ]; buildInputs = [ qt4 ];
nativeBuildInputs = [ makeWrapper qmake4Hook ]; nativeBuildInputs = [ makeWrapper qmake4Hook ];

View file

@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
owner = "mcmilk"; owner = "mcmilk";
}; };
sourceRoot = "zstdmt-v${version}-src/unix"; setSourceRoot = ''
sourceRoot=$(echo */unix)
'';
buildInputs = [ buildInputs = [
zstd lz4 zstd lz4

View file

@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
sha256 = "1izjy5qw6swg0rs2ym2i72zndb90mwrfbd1iv8xbpwckbm4899lg"; sha256 = "1izjy5qw6swg0rs2ym2i72zndb90mwrfbd1iv8xbpwckbm4899lg";
}; };
setSourceRoot = "export sourceRoot=$(echo zinnia-*/zinnia/)"; setSourceRoot = ''
sourceRoot=$(echo */zinnia)
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Online hand recognition system with machine learning"; description = "Online hand recognition system with machine learning";

View file

@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
sha256 = "1ihma4f6f92jp1mvzr4rjrgyh9m5wzrlxngaxfn7g0a8r2kyi65b"; sha256 = "1ihma4f6f92jp1mvzr4rjrgyh9m5wzrlxngaxfn7g0a8r2kyi65b";
}; };
sourceRoot = "source/Unix"; setSourceRoot = ''
sourceRoot=$(echo */Unix)
'';
buildInputs = [ makeWrapper perl AlgorithmDiff RegexpCommon ]; buildInputs = [ makeWrapper perl AlgorithmDiff RegexpCommon ];

View file

@ -13,7 +13,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ libpcap sqlite ]; buildInputs = [ libpcap sqlite ];
sourceRoot = "reaver-${version}/src";
setSourceRoot = ''
sourceRoot=$(echo */src)
'';
configureFlags = "--sysconfdir=${confdir}"; configureFlags = "--sysconfdir=${confdir}";

View file

@ -23,7 +23,9 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
buildInputs = [ automake autoconf libtool zimlib cxxtools tntnet ]; buildInputs = [ automake autoconf libtool zimlib cxxtools tntnet ];
setSourceRoot = "cd openzim-*/zimreader; export sourceRoot=`pwd`"; setSourceRoot = ''
sourceRoot=$(echo */zimreader)
'';
preConfigure = "./autogen.sh"; preConfigure = "./autogen.sh";
meta = { meta = {

View file

@ -28,7 +28,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; nativeBuildInputs = [ automake autoconf libtool pkgconfig ];
buildInputs = [ file icu libgumbo lzma zimlib zlib xapian ]; buildInputs = [ file icu libgumbo lzma zimlib zlib xapian ];
setSourceRoot = "cd openzim-*/zimwriterfs; export sourceRoot=`pwd`"; setSourceRoot = ''
sourceRoot=$(echo */zimwriterfs)
'';
preConfigure = "./autogen.sh"; preConfigure = "./autogen.sh";
meta = { meta = {