diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-13 10:14:53 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-13 10:14:53 +0200 |
commit | 3e387c3e005c87566b5403d24c86f71f4945a79b (patch) | |
tree | 6ddd883a2e405850093d1f19cd18bb9b712e7c01 /pkgs/tools/networking | |
parent | df8958435e1fd0c6d55394e95d3d3d2e0edca474 (diff) | |
parent | 6c2fbfbd7720446821be2a506cefcd1e0ff3b42d (diff) | |
download | nixpkgs-3e387c3e005c87566b5403d24c86f71f4945a79b.tar nixpkgs-3e387c3e005c87566b5403d24c86f71f4945a79b.tar.gz nixpkgs-3e387c3e005c87566b5403d24c86f71f4945a79b.tar.bz2 nixpkgs-3e387c3e005c87566b5403d24c86f71f4945a79b.tar.lz nixpkgs-3e387c3e005c87566b5403d24c86f71f4945a79b.tar.xz nixpkgs-3e387c3e005c87566b5403d24c86f71f4945a79b.tar.zst nixpkgs-3e387c3e005c87566b5403d24c86f71f4945a79b.zip |
Merge branch 'staging'
Darwin isn't in a perfect state, in particular its bootstrap tools won't build which will block nixpkgs channel. But on the whole it seems acceptable.
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r-- | pkgs/tools/networking/network-manager/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/networking/swec/default.nix | 43 |
2 files changed, 24 insertions, 21 deletions
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index afdca314ae6..ecc8f1908de 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { sha256 = "17jan0g5jzp8mrpklyacwdgnnw016m1c5pc4az5im6qhc260yirs"; }; + outputs = [ "dev" "out" ]; + preConfigure = '' substituteInPlace configure --replace /usr/bin/uname ${coreutils}/bin/uname substituteInPlace configure --replace /usr/bin/file ${file}/bin/file diff --git a/pkgs/tools/networking/swec/default.nix b/pkgs/tools/networking/swec/default.nix index 3e8f3ca3dc5..f8a8b6393d2 100644 --- a/pkgs/tools/networking/swec/default.nix +++ b/pkgs/tools/networking/swec/default.nix @@ -5,33 +5,34 @@ stdenv.mkDerivation rec { name = "swec-0.4"; src = fetchurl { - url = "http://random.zerodogg.org/files/${name}.tar.bz2"; + url = "http://files.zerodogg.org/swec/${name}.tar.bz2"; sha256 = "1m3971z4z1wr0paggprfz0n8ng8vsnkc9m6s3bdplgyz7qjk6jwx"; }; buildInputs = [ makeWrapper perl LWP URI HTMLParser ] ++ stdenv.lib.optional doCheck [ HTTPServerSimple Parent ]; - configurePhase = - '' for i in swec tests/{runTests,testServer} - do - sed -i "$i" -e's|/usr/bin/perl|${perl}/bin/perl|g' - done - ''; - - buildPhase = "true"; - installPhase = - '' make install prefix="$out" - - mkdir -p "$out/share/${name}" - cp -v default.sdf "$out/share/${name}" - sed -i "$out/bin/swec" -e"s|realpath(\$0)|'$out/share/${name}/swec'|g" - - wrapProgram "$out/bin/swec" \ - --prefix PERL5LIB : \ - ${stdenv.lib.concatStringsSep ":" - (map (x: "${x}/lib/perl5/site_perl") [ LWP URI HTMLParser ])} - ''; + configurePhase = '' + for i in swec tests/{runTests,testServer} + do + sed -i "$i" -e's|/usr/bin/perl|${perl}/bin/perl|g' + done + ''; + + dontBuild = true; + + installPhase = '' + make install prefix="$out" + + mkdir -p "$out/share/${name}" + cp -v default.sdf "$out/share/${name}" + sed -i "$out/bin/swec" -e"s|realpath(\$0)|'$out/share/${name}/swec'|g" + + wrapProgram "$out/bin/swec" \ + --prefix PERL5LIB : \ + ${stdenv.lib.concatStringsSep ":" + (map (x: "${x}/lib/perl5/site_perl") [ LWP URI HTMLParser ])} + ''; doCheck = true; checkPhase = "make test"; |