diff options
author | Piotr Bogdan <ppbogdan@gmail.com> | 2017-11-02 12:54:20 +0000 |
---|---|---|
committer | Piotr Bogdan <ppbogdan@gmail.com> | 2017-11-02 13:53:36 +0000 |
commit | 8904ce343a67071dd080260d356fea556de7d0f2 (patch) | |
tree | 2ebffc24e1d4f6ea56477b5f6acc82b442a1b266 /pkgs/tools | |
parent | 7f921735e76076196a93fa55c234a6f1d01534a9 (diff) | |
download | nixpkgs-8904ce343a67071dd080260d356fea556de7d0f2.tar nixpkgs-8904ce343a67071dd080260d356fea556de7d0f2.tar.gz nixpkgs-8904ce343a67071dd080260d356fea556de7d0f2.tar.bz2 nixpkgs-8904ce343a67071dd080260d356fea556de7d0f2.tar.lz nixpkgs-8904ce343a67071dd080260d356fea556de7d0f2.tar.xz nixpkgs-8904ce343a67071dd080260d356fea556de7d0f2.tar.zst nixpkgs-8904ce343a67071dd080260d356fea556de7d0f2.zip |
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
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/cd-dvd/unetbootin/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/compression/zstdmt/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/inputmethods/zinnia/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/cloc/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/reaver-wps/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/text/zimreader/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/text/zimwriterfs/default.nix | 4 |
7 files changed, 22 insertions, 7 deletions
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 = { |