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: 326a1e0cd460
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d97be426cc9d
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Nov 10, 2019

  1. glib: fix all shebangs of scripts in $dev output

    @Ma27
    Ma27 committed Nov 10, 2019
    Copy the full SHA
    123172b View commit details

  2. treewide: mv NIX_LDFLAGS to env.

    @Ma27
    Ma27 committed Nov 10, 2019
    Copy the full SHA
    d97be42 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/graphics/gimp/plugins/default.nix
View file
Original file line number Diff line number Diff line change
@@ -48,7 +48,7 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; {
url = https://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/gimp-gap-2.6.0.tar.bz2;
sha256 = "1jic7ixcmsn4kx2cn32nc5087rk6g8xsrz022xy11yfmgvhzb0ql";
};
NIX_LDFLAGS = [ "-lm" ];
env.NIX_LDFLAGS = "-lm";
patchPhase = ''
sed -e 's,^\(GIMP_PLUGIN_DIR=\).*,\1'"$out/${gimp.name}-plugins", \
-e 's,^\(GIMP_DATA_DIR=\).*,\1'"$out/share/${gimp.name}", -i configure
@@ -134,7 +134,7 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; {
Filters/Enhance/Wavelet sharpen
*/
name = "wavelet-sharpen-0.1.2";
NIX_LDFLAGS = [ "-lm" ];
env.NIX_LDFLAGS = "-lm";
src = fetchurl {
url = http://registry.gimp.org/files/wavelet-sharpen-0.1.2.tar.gz;
sha256 = "0vql1k67i21g5ivaa1jh56rg427m0icrkpryrhg75nscpirfxxqw";
2 changes: 1 addition & 1 deletion pkgs/development/libraries/glib/default.nix
View file
Original file line number Diff line number Diff line change
@@ -150,7 +150,7 @@ stdenv.mkDerivation rec {
sed '1i#line 1 "${pname}-${version}/include/glib-2.0/gobject/gobjectnotifyqueue.c"' \
-i "$dev"/include/glib-2.0/gobject/gobjectnotifyqueue.c
patchShebangs "$dev/bin/gdbus-codegen"
patchShebangs "$dev/bin/"
'' + optionalString (!stdenv.isDarwin) ''
# Add gio-launch-desktop to $out so we can refer to it from $lib
mkdir $out/bin
2 changes: 1 addition & 1 deletion pkgs/development/python-modules/tensorflow/default.nix
View file
Original file line number Diff line number Diff line change
@@ -246,7 +246,7 @@ let
'';

# FIXME: Tensorflow uses dlopen() for CUDA libraries.
NIX_LDFLAGS = lib.optionalString cudaSupport "-lcudart -lcublas -lcufft -lcurand -lcusolver -lcusparse -lcudnn";
env.NIX_LDFLAGS = lib.optionalString cudaSupport "-lcudart -lcublas -lcufft -lcurand -lcusolver -lcusparse -lcudnn";

hardeningDisable = [ "format" ];