Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: dadb283ef5bf
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 86ca675a2847
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jul 10, 2017

  1. netselect: Fix attempt to use unsupported permissions on files in store 

    (cherry picked from commit 59bf263)
    @dtzWill @joachifm
    dtzWill authored and joachifm committed Jul 10, 2017
    Copy the full SHA
    69a346f View commit details

  2. wcslib: fix attempts to use unsupported permissions during install 

    (cherry picked from commit 15253a8)
    @dtzWill @joachifm
    dtzWill authored and joachifm committed Jul 10, 2017
    Copy the full SHA
    86ca675 View commit details
Showing with 11 additions and 3 deletions.
  1. +5 −0 pkgs/development/libraries/wcslib/default.nix
  2. +6 −3 pkgs/tools/networking/netselect/default.nix
5 changes: 5 additions & 0 deletions pkgs/development/libraries/wcslib/default.nix
View file
Original file line number Diff line number Diff line change
@@ -11,6 +11,11 @@ stdenv.mkDerivation rec {
sha256 ="1s2nig327g4bimd9xshlk11ww09a7mrjmsbpdcd8smsmn2kl1glb";
};

prePatch = ''
substituteInPlace GNUmakefile --replace 2775 0775
substituteInPlace C/GNUmakefile --replace 2775 0775
'';

enableParallelBuilding = true;

meta = {
9 changes: 6 additions & 3 deletions pkgs/tools/networking/netselect/default.nix
View file
Original file line number Diff line number Diff line change
@@ -8,10 +8,13 @@ stdenv.mkDerivation {
sha256 = "0y69z59vylj9x9nk5jqn6ihx7dkzg09gpv2w1q1rs8fmi4jr90gy";
};

preBuild = "
preBuild = ''
makeFlagsArray=(PREFIX=$out)
substituteInPlace Makefile --replace '-o root' '' --replace '-g root' ''
";
substituteInPlace Makefile \
--replace "-o root" "" \
--replace "-g root" "" \
--replace "4755" "0755"
'';

meta = {
homepage = http://alumnit.ca/~apenwarr/netselect/;