commit d86588d23033955df991216f49e334fc9b0e36f1 · pyrox.dev/nixpkgs

+9 -7

pkgs/applications/audio/fmit/default.nix

···

       28
       28
        
           substituteInPlace fmit.pro --replace '$$FMITVERSIONGITPRO' '${version}'

     

       29
       29
        
         '';

     

       30
       30
        
       

     

       31
       31
       -
         preConfigure = ''

     

       32
       32
       -
           qmakeFlags="$qmakeFlags \

     

       33
       33
       -
             CONFIG+=${lib.optionalString alsaSupport "acs_alsa"} \

     

       34
       34
       -
             CONFIG+=${lib.optionalString jackSupport "acs_jack"} \

     

       35
       35
       -
             CONFIG+=${lib.optionalString portaudioSupport "acs_portaudio"} \

     

       36
       36
       -
             PREFIXSHORTCUT=$out"

     

       37
       37
       -
         '';

     

       31
       31
       +
         qmakeFlags = [

     

       32
       32
       +
           "PREFIXSHORTCUT=${placeholder "out"}"

     

       33
       33
       +
         ] ++ lib.optionals alsaSupport [

     

       34
       34
       +
           "CONFIG+=acs_alsa"

     

       35
       35
       +
         ] ++ lib.optionals jackSupport [

     

       36
       36
       +
           "CONFIG+=acs_jack"

     

       37
       37
       +
         ] ++ lib.optionals portaudioSupport [

     

       38
       38
       +
           "CONFIG+=acs_portaudio"

     

       39
       39
       +
         ];

     

       38
       40
        
       

     

       39
       41
        
         meta = with lib; {

     

       40
       42
        
           description = "Free Musical Instrument Tuner";

+1 -3

pkgs/applications/audio/sonic-pi/default.nix

···

       105
       105
        
           "-DUSE_SYSTEM_LIBS=ON"

     

       106
       106
        
           "-DBUILD_IMGUI_INTERFACE=${if withImGui then "ON" else "OFF"}"

     

       107
       107
        
           "-DWITH_QT_GUI_WEBENGINE=${if withTauWidget then "ON" else "OFF"}"

     

       108
       108
       +
           "-DAPP_INSTALL_ROOT=${placeholder "out"}/app"

     

       108
       109
        
         ];

     

       109
       110
        
       

     

       110
       111
        
         doCheck = true;

     
···

       136
       137
        
       

     

       137
       138
        
           # Prebuild Ruby vendored dependencies and Qt docs

     

       138
       139
        
           ./linux-prebuild.sh -o

     

       139
       139
       -
       

     

       140
       140
       -
           # Append CMake flag depending on the value of $out

     

       141
       141
       -
           cmakeFlags+=" -DAPP_INSTALL_ROOT=$out/app"

     

       142
       140
        
         '';

     

       143
       141
        
       

     

       144
       142
        
         postBuild = ''

+3 -3

pkgs/applications/kde/marble.nix

···

       18
       18
        
           protobuf_21 qtscript qtsvg qtquickcontrols qtwebengine shared-mime-info krunner kparts

     

       19
       19
        
           knewstuff gpsd

     

       20
       20
        
         ];

     

       21
       21
       -
         preConfigure = ''

     

       22
       22
       -
           cmakeFlags+=" -DINCLUDE_INSTALL_DIR=''${!outputDev}/include"

     

       23
       23
       -
         '';

     

       21
       21
       +
         cmakeFlags = [

     

       22
       22
       +
           "-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include"

     

       23
       23
       +
         ];

     

       24
       24
        
       }

+3 -3

pkgs/applications/misc/maliit-framework/default.nix

···

       66
       66
        
           wayland-scanner

     

       67
       67
        
         ];

     

       68
       68
        
       

     

       69
       69
       -
         preConfigure = ''

     

       70
       70
       -
           cmakeFlags+="-DQT5_PLUGINS_INSTALL_DIR=$out/$qtPluginPrefix"

     

       71
       71
       -
         '';

     

       69
       69
       +
         cmakeFlags = [

     

       70
       70
       +
           "-DQT5_PLUGINS_INSTALL_DIR=${placeholder "out"}/$qtPluginPrefix"

     

       71
       71
       +
         ];

     

       72
       72
        
       

     

       73
       73
        
         meta = with lib; {

     

       74
       74
        
           description = "Core libraries of Maliit and server";

+4 -2

pkgs/applications/science/misc/boinc/default.nix

···

       63
       63
        
       

     

       64
       64
        
         preConfigure = ''

     

       65
       65
        
           ./_autosetup

     

       66
       66
       -
           configureFlags="$configureFlags --sysconfdir=$out/etc"

     

       67
       66
        
         '';

     

       68
       67
        
       

     

       69
       68
        
         enableParallelBuilding = true;

     

       70
       69
        
       

     

       71
       71
       -
         configureFlags = [ "--disable-server" ] ++ lib.optionals headless [ "--disable-manager" ];

     

       70
       70
       +
         configureFlags = [

     

       71
       71
       +
           "--disable-server"

     

       72
       72
       +
           "--sysconfdir=${placeholder "out"}/etc"

     

       73
       73
       +
         ] ++ lib.optionals headless [ "--disable-manager" ];

     

       72
       74
        
       

     

       73
       75
        
         postInstall = ''

     

       74
       76
        
           install --mode=444 -D 'client/scripts/boinc-client.service' "$out/etc/systemd/system/boinc.service"

+1 -1

pkgs/applications/version-management/monotone-viz/default.nix

···

       38
       38
        
         ];

     

       39
       39
        
       

     

       40
       40
        
         preConfigure = ''

     

       41
       41
       -
           configureFlags="$configureFlags --with-lablgtk-dir=$(echo ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2)"

     

       41
       41
       +
           appendToVar configureFlags "--with-lablgtk-dir=$(echo ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2)"

     

       42
       42
        
         '';

     

       43
       43
        
       

     

       44
       44
        
         postInstall = ''

+4 -1

pkgs/applications/version-management/vcprompt/default.nix

···

       14
       14
        
       

     

       15
       15
        
         preConfigure = ''

     

       16
       16
        
           autoconf

     

       17
       17
       -
           makeFlags="$makeFlags PREFIX=$out"

     

       18
       17
        
         '';

     

       18
       18
       +
       

     

       19
       19
       +
         makeFlags = [

     

       20
       20
       +
           "PREFIX=${placeholder "out"}"

     

       21
       21
       +
         ];

     

       19
       22
        
       

     

       20
       23
        
         meta = with lib; {

     

       21
       24
        
           description = ''

+2 -2

pkgs/applications/video/kodi/unwrapped.nix

···

       214
       214
        
             # Need these tools on the build system when cross compiling,

     

       215
       215
        
             # hacky, but have found no other way.

     

       216
       216
        
             CXX=$CXX_FOR_BUILD LD=ld make -C tools/depends/native/JsonSchemaBuilder

     

       217
       217
       -
             cmakeFlags+=" -DWITH_JSONSCHEMABUILDER=$PWD/tools/depends/native/JsonSchemaBuilder/bin"

     

       217
       217
       +
             appendToVar cmakeFlags "-DWITH_JSONSCHEMABUILDER=$PWD/tools/depends/native/JsonSchemaBuilder/bin"

     

       218
       218
        
       

     

       219
       219
        
             CXX=$CXX_FOR_BUILD LD=ld make EXTRA_CONFIGURE= -C tools/depends/native/TexturePacker

     

       220
       220
       -
             cmakeFlags+=" -DWITH_TEXTUREPACKER=$PWD/tools/depends/native/TexturePacker/bin"

     

       220
       220
       +
             appendToVar cmakeFlags "-DWITH_TEXTUREPACKER=$PWD/tools/depends/native/TexturePacker/bin"

     

       221
       221
        
           '';

     

       222
       222
        
       

     

       223
       223
        
           postPatch = ''

+1 -1

pkgs/build-support/release/binary-tarball.nix

···

       48
       48
        
       

     

       49
       49
        
             # Prefix hackery because of a bug in stdenv (it tries to `mkdir

     

       50
       50
        
             # $prefix', which doesn't work due to the DESTDIR).

     

       51
       51
       -
             configureFlags="--prefix=$prefix $configureFlags"

     

       51
       51
       +
             prependToVar configureFlags "--prefix=$prefix"

     

       52
       52
        
             dontAddPrefix=1

     

       53
       53
        
             prefix=$TMPDIR/inst$prefix

     

       54
       54
        
           '';

+4 -1

pkgs/by-name/cl/cl-launch/package.nix

···

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         preConfigure = ''

     

       12
       12
       -
           export makeFlags="$makeFlags PREFIX='$out'"

     

       13
       12
        
           mkdir -p "$out/bin"

     

       14
       13
        
         '';

     

       14
       14
       +
       

     

       15
       15
       +
         makeFlags = [

     

       16
       16
       +
           "PREFIX=${placeholder "out"}"

     

       17
       17
       +
         ];

     

       15
       18
        
       

     

       16
       19
        
         preBuild = ''

     

       17
       20
        
           sed -e 's/\t\t@/\t\t/g' -i Makefile

+1 -3

pkgs/by-name/fl/fluxus/package.nix

···

       58
       58
        
           "RacketInclude=${racket}/include/racket"

     

       59
       59
        
           "RacketLib=${racket}/lib/racket"

     

       60
       60
        
           "DESTDIR=build"

     

       61
       61
       +
           "Prefix=${placeholder "out"}"

     

       61
       62
        
         ];

     

       62
       62
       -
         configurePhase = ''

     

       63
       63
       -
           sconsFlags+=" Prefix=$out"

     

       64
       64
       -
         '';

     

       65
       63
        
         installPhase = ''

     

       66
       64
        
           mkdir -p $out

     

       67
       65
        
           cp -r build$out/* $out/

+5 -5

pkgs/by-name/gl/globulation2/package.nix

···

       51
       51
        
         nativeBuildInputs = [ scons ];

     

       52
       52
        
         buildInputs = [ libGLU libGL SDL SDL_ttf SDL_image zlib SDL_net speex libvorbis libogg boost fribidi bsdiff ];

     

       53
       53
        
       

     

       54
       54
       -
         postConfigure = ''

     

       55
       55
       -
           sconsFlags+=" BINDIR=$out/bin"

     

       56
       56
       -
           sconsFlags+=" INSTALLDIR=$out/share/globulation2"

     

       57
       57
       -
           sconsFlags+=" DATADIR=$out/share/globulation2/glob2"

     

       58
       58
       -
         '';

     

       54
       54
       +
         sconsFlags = [

     

       55
       55
       +
           "BINDIR=${placeholder "out"}/bin"

     

       56
       56
       +
           "INSTALLDIR=${placeholder "out"}/share/globulation2"

     

       57
       57
       +
           "DATADIR=${placeholder "out"}/share/globulation2/glob2"

     

       58
       58
       +
         ];

     

       59
       59
        
       

     

       60
       60
        
         NIX_LDFLAGS = "-lboost_system";

     

       61
       61

+2 -3

pkgs/by-name/gp/gpsd/package.nix

···

       89
       89
        
           sed -e "s|systemd_dir = .*|systemd_dir = '$out/lib/systemd/system'|" -i SConscript

     

       90
       90
        
           export TAR=noop

     

       91
       91
        
           substituteInPlace SConscript --replace "env['CCVERSION']" "env['CC']"

     

       92
       92
       -
       

     

       93
       93
       -
           sconsFlags+=" udevdir=$out/lib/udev"

     

       94
       94
       -
           sconsFlags+=" python_libdir=$out/${python3Packages.python.sitePackages}"

     

       95
       92
        
         '';

     

       96
       93
        
       

     

       97
       94
        
         # - leapfetch=no disables going online at build time to fetch leap-seconds

     
···

       102
       99
        
           "gpsd_group=${gpsdGroup}"

     

       103
       100
        
           "systemd=yes"

     

       104
       101
        
           "xgps=${if guiSupport then "True" else "False"}"

     

       102
       102
       +
           "udevdir=${placeholder "out"}/lib/udev"

     

       103
       103
       +
           "python_libdir=${placeholder "out"}/${python3Packages.python.sitePackages}"

     

       105
       104
        
         ];

     

       106
       105
        
       

     

       107
       106
        
         preCheck = ''

+3 -3

pkgs/by-name/gt/gt5/package.nix

···

       13
       13
        
           sed 's/-o root -g root//' -i Makefile

     

       14
       14
        
         '';

     

       15
       15
        
       

     

       16
       16
       -
         preConfigure = ''

     

       17
       17
       -
           makeFlags="$makeFlags PREFIX=$out"

     

       18
       18
       -
         '';

     

       16
       16
       +
         makeFlags = [

     

       17
       17
       +
           "PREFIX=${placeholder "out"}"

     

       18
       18
       +
         ];

     

       19
       19
        
       

     

       20
       20
        
         meta = {

     

       21
       21
        
           description = "Diff-capable 'du' browser";

+4 -1

pkgs/by-name/lx/lxdvdrip/package.nix

···

       12
       12
        
         postPatch = ''

     

       13
       13
        
           sed -i -e s,/usr/local,$out, -e s,/etc,$out/etc,g Makefile

     

       14
       14
        
           sed -i -e s,/usr/local,$out, mbuffer/Makefile

     

       15
       15
       -
           makeFlags="$makeFlags PREFIX=$out"

     

       16
       15
        
         '';

     

       16
       16
       +
       

     

       17
       17
       +
         makeFlags = [

     

       18
       18
       +
           "PREFIX=${placeholder "out"}"

     

       19
       19
       +
         ];

     

       17
       20
        
       

     

       18
       21
        
         preInstall = ''

     

       19
       22
        
           mkdir -p $out/man/man1 $out/bin $out/share $out/etc

+1 -1

pkgs/by-name/ne/netcdfcxx4/package.nix

···

       16
       16
        
         ];

     

       17
       17
        
       

     

       18
       18
        
         preConfigure = ''

     

       19
       19
       -
           cmakeFlags+="-Dabs_top_srcdir=$(readlink -f ./)"

     

       19
       19
       +
           appendToVar cmakeFlags "-Dabs_top_srcdir=$(readlink -f ./)"

     

       20
       20
        
         '';

     

       21
       21
        
       

     

       22
       22
        
         nativeBuildInputs = [ cmake ninja ];

+2 -3

pkgs/by-name/nf/nfs-utils/package.nix

···

       42
       42
        
           '';

     

       43
       43
        
       

     

       44
       44
        
         configureFlags =

     

       45
       45
       -
           [ "--enable-gss"

     

       45
       45
       +
           [ "--with-start-statd=${placeholder "out"}/bin/start-statd"

     

       46
       46
       +
             "--enable-gss"

     

       46
       47
        
             "--enable-svcgss"

     

       47
       48
        
             "--with-statedir=/var/lib/nfs"

     

       48
       49
        
             "--with-krb5=${lib.getLib libkrb5}"

     
···

       66
       67
        
             patchShebangs tests

     

       67
       68
        
             sed -i "s,/usr/sbin,$out/bin,g" utils/statd/statd.c

     

       68
       69
        
             sed -i "s,^PATH=.*,PATH=$out/bin:${statdPath}," utils/statd/start-statd

     

       69
       69
       -
       

     

       70
       70
       -
             configureFlags="--with-start-statd=$out/bin/start-statd $configureFlags"

     

       71
       70
        
       

     

       72
       71
        
             substituteInPlace systemd/nfs-utils.service \

     

       73
       72
        
               --replace "/bin/true" "${coreutils}/bin/true"

+2 -1

pkgs/by-name/np/np2kai/package.nix

···

       124
       124
        
       

     

       125
       125
        
         configurePhase = ''

     

       126
       126
        
           export GIT_VERSION=${builtins.substring 0 7 src.rev}

     

       127
       127
       -
           buildFlags="$buildFlags ''${enableParallelBuilding:+-j$NIX_BUILD_CORES}"

     

       127
       127
       +
         '' + optionalString enableParallelBuilding ''

     

       128
       128
       +
           appendToVar buildFlags "-j$NIX_BUILD_CORES"

     

       128
       129
        
         '' + optionalString enableX11 ''

     

       129
       130
        
           cd x11

     

       130
       131
        
           substituteInPlace Makefile.am \

+4 -2

pkgs/by-name/pa/pacparser/package.nix

···

       11
       11
        
           sha256 = "sha256-X842+xPjM404aQJTc2JwqU4vq8kgyKhpnqVu70pNLks=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         makeFlags = [ "NO_INTERNET=1" ];

     

       14
       14
       +
         makeFlags = [

     

       15
       15
       +
           "NO_INTERNET=1"

     

       16
       16
       +
           "PREFIX=${placeholder "out"}"

     

       17
       17
       +
         ];

     

       15
       18
        
       

     

       16
       19
        
         preConfigure = ''

     

       17
       17
       -
           export makeFlags="$makeFlags PREFIX=$out"

     

       18
       20
        
           patchShebangs tests/runtests.sh

     

       19
       21
        
           cd src

     

       20
       22
        
         '';

+1 -1

pkgs/by-name/pa/patchPpdFilesHook/patch-ppd-hook.sh

···

       174
       174
        
                   # The end result might contain too many

     

       175
       175
        
                   # propagated dependencies for multi-output packages,

     

       176
       176
        
                   # but never a broken package.

     

       177
       177
       -
                   propagatedBuildInputs+=("$path")

     

       177
       177
       +
                   appendToVar propagatedBuildInputs "$path"

     

       178
       178
        
               done  < sorted-dependencies

     

       179
       179
        
           fi

     

       180
       180

+1 -1

pkgs/by-name/pu/pulseaudio-module-xrdp/package.nix

···

       24
       24
        
           mv pulseaudio-* pulseaudio-src

     

       25
       25
        
           chmod +w -Rv pulseaudio-src

     

       26
       26
        
           cp ${pulseaudio.dev}/include/pulse/config.h pulseaudio-src

     

       27
       27
       -
           configureFlags="$configureFlags PULSE_DIR=$(realpath ./pulseaudio-src)"

     

       27
       27
       +
           appendToVar configureFlags "PULSE_DIR=$(realpath ./pulseaudio-src)"

     

       28
       28
        
         '';

     

       29
       29
        
       

     

       30
       30
        
         installPhase = ''

+1 -1

pkgs/by-name/ro/rocksndiamonds/package.nix

···

       32
       32
        
       

     

       33
       33
        
         preBuild = ''

     

       34
       34
        
           dataDir="$out/share/rocksndiamonds"

     

       35
       35
       -
           makeFlags+="BASE_PATH=$dataDir"

     

       35
       35
       +
           appendToVar makeFlags "BASE_PATH=$dataDir"

     

       36
       36
        
         '';

     

       37
       37
        
       

     

       38
       38
        
         installPhase = ''

+6 -6

pkgs/by-name/rt/rt/package.nix

···

       123
       123
        
           echo rt-${version} > .tag

     

       124
       124
        
         '';

     

       125
       125
        
         preConfigure = ''

     

       126
       126
       -
           configureFlags="$configureFlags --with-web-user=$UID"

     

       127
       127
       -
           configureFlags="$configureFlags --with-web-group=$(id -g)"

     

       128
       128
       -
           configureFlags="$configureFlags --with-rt-group=$(id -g)"

     

       129
       129
       -
           configureFlags="$configureFlags --with-bin-owner=$UID"

     

       130
       130
       -
           configureFlags="$configureFlags --with-libs-owner=$UID"

     

       131
       131
       -
           configureFlags="$configureFlags --with-libs-group=$(id -g)"

     

       126
       126
       +
           appendToVar configureFlags "--with-web-user=$UID"

     

       127
       127
       +
           appendToVar configureFlags "--with-web-group=$(id -g)"

     

       128
       128
       +
           appendToVar configureFlags "--with-rt-group=$(id -g)"

     

       129
       129
       +
           appendToVar configureFlags "--with-bin-owner=$UID"

     

       130
       130
       +
           appendToVar configureFlags "--with-libs-owner=$UID"

     

       131
       131
       +
           appendToVar configureFlags "--with-libs-group=$(id -g)"

     

       132
       132
        
         '';

     

       133
       133
        
         configureFlags = [

     

       134
       134
        
           "--enable-graphviz"

+6 -6

pkgs/by-name/se/serf/package.nix

···

       37
       37
        
         prefixKey = "PREFIX=";

     

       38
       38
        
       

     

       39
       39
        
         preConfigure = ''

     

       40
       40
       -
           sconsFlags+=" APR=$(echo ${apr.dev}/bin/*-config)"

     

       41
       41
       -
           sconsFlags+=" APU=$(echo ${aprutil.dev}/bin/*-config)"

     

       42
       42
       -
           sconsFlags+=" CC=$CC"

     

       43
       43
       -
           sconsFlags+=" OPENSSL=${openssl}"

     

       44
       44
       -
           sconsFlags+=" ZLIB=${zlib}"

     

       40
       40
       +
           appendToVar sconsFlags "APR=$(echo ${apr.dev}/bin/*-config)"

     

       41
       41
       +
           appendToVar sconsFlags "APU=$(echo ${aprutil.dev}/bin/*-config)"

     

       42
       42
       +
           appendToVar sconsFlags "CC=$CC"

     

       43
       43
       +
           appendToVar sconsFlags "OPENSSL=${openssl}"

     

       44
       44
       +
           appendToVar sconsFlags "ZLIB=${zlib}"

     

       45
       45
        
         '' + lib.optionalString (!stdenv.hostPlatform.isCygwin) ''

     

       46
       46
       -
           sconsFlags+=" GSSAPI=${libkrb5.dev}"

     

       46
       46
       +
           appendToVar sconsFlags "GSSAPI=${libkrb5.dev}"

     

       47
       47
        
         '';

     

       48
       48
        
       

     

       49
       49
        
         enableParallelBuilding = true;

+5 -5

pkgs/by-name/si/silc_client/package.nix

···

       19
       19
        
       

     

       20
       20
        
         hardeningDisable = [ "format" ];

     

       21
       21
        
       

     

       22
       22
       -
         configureFlags = [ "--with-ncurses=${ncurses.dev}" ];

     

       23
       23
       -
       

     

       24
       24
       -
         preConfigure = lib.optionalString enablePlugin ''

     

       25
       25
       -
           configureFlags="$configureFlags --with-silc-plugin=$out/lib/irssi"

     

       26
       26
       -
         '';

     

       22
       22
       +
         configureFlags = [

     

       23
       23
       +
           "--with-ncurses=${ncurses.dev}"

     

       24
       24
       +
         ] ++ lib.optionals enablePlugin [

     

       25
       25
       +
           "--with-silc-plugin=${placeholder "out"}/lib/irssi"

     

       26
       26
       +
         ];

     

       27
       27
        
       

     

       28
       28
        
         nativeBuildInputs = [ pkg-config ];

     

       29
       29
        
         buildInputs = [ perl glib ncurses ];

+1 -4

pkgs/by-name/sp/spaceFM/package.nix

···

       30
       30
        
       

     

       31
       31
        
         configureFlags = [

     

       32
       32
        
           "--with-bash-path=${pkgs.bash}/bin/bash"

     

       33
       33
       +
           "--sysconfdir=${placeholder "out"}/etc"

     

       33
       34
        
         ];

     

       34
       34
       -
       

     

       35
       35
       -
         preConfigure = ''

     

       36
       36
       -
           configureFlags="$configureFlags --sysconfdir=$out/etc"

     

       37
       37
       -
         '';

     

       38
       35
        
       

     

       39
       36
        
         postInstall = ''

     

       40
       37
        
           rm -f $out/etc/spacefm/spacefm.conf

+4 -1

pkgs/by-name/tr/trigger/package.nix

···

       32
       32
        
       

     

       33
       33
        
           sed s,lSDL2main,lSDL2, -i GNUmakefile

     

       34
       34
        
           export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${SDL2.dev}/include/SDL2"

     

       35
       35
       -
           export makeFlags="$makeFlags prefix=$out"

     

       36
       35
        
         '';

     

       36
       36
       +
       

     

       37
       37
       +
         makeFlags = [

     

       38
       38
       +
           "prefix=${placeholder "out"}"

     

       39
       39
       +
         ];

     

       37
       40
        
       

     

       38
       41
        
         enableParallelBuilding = true;

     

       39
       42

+4 -1

pkgs/by-name/ts/tsocks/package.nix

···

       14
       14
        
         preConfigure = ''

     

       15
       15
        
           sed -i -e "s,\\\/usr,"$(echo $out|sed -e "s,\\/,\\\\\\\/,g")",g" tsocks

     

       16
       16
        
           substituteInPlace tsocks --replace /usr $out

     

       17
       17
       -
           export configureFlags="$configureFlags --libdir=$out/lib"

     

       18
       17
        
         '';

     

       18
       18
       +
       

     

       19
       19
       +
         configureFlags = [

     

       20
       20
       +
           "--libdir=${placeholder "out"}/lib"

     

       21
       21
       +
         ];

     

       19
       22
        
       

     

       20
       23
        
         preBuild = ''

     

       21
       24
        
           # We don't need the saveme binary, it is in fact never stored and we're

+2 -1

pkgs/by-name/un/unbound/package.nix

···

       140
       140
        
           # Build libunbound again, but only against nettle instead of openssl.

     

       141
       141
        
           # This avoids gnutls.out -> unbound.lib -> lib.getLib openssl.

     

       142
       142
        
           ''

     

       143
       143
       -
             configureFlags="$configureFlags --with-nettle=${nettle.dev} --with-libunbound-only"

     

       143
       143
       +
             appendToVar configureFlags "--with-nettle=${nettle.dev}"

     

       144
       144
       +
             appendToVar configureFlags "--with-libunbound-only"

     

       144
       145
        
             configurePhase

     

       145
       146
        
             buildPhase

     

       146
       147
        
             if [ -n "$doCheck" ]; then

+1 -1

pkgs/by-name/xl/xlockmore/package.nix

···

       19
       19
        
         # fine via PAM without super user privileges.

     

       20
       20
        
         configureFlags =

     

       21
       21
        
           [ "--disable-setuid"

     

       22
       22
       +
             "--enable-appdefaultdir=${placeholder "out"}/share/X11/app-defaults"

     

       22
       23
        
           ] ++ (lib.optional (pam != null) "--enable-pam");

     

       23
       24
        
       

     

       24
       25
        
         postPatch =

     
···

       27
       28
        
           in ''

     

       28
       29
        
             sed -i 's,\(for ac_dir in\),\1 ${inputs},' configure.ac

     

       29
       30
        
             sed -i 's,/usr/,/no-such-dir/,g' configure.ac

     

       30
       30
       -
             configureFlags+=" --enable-appdefaultdir=$out/share/X11/app-defaults"

     

       31
       31
        
           '';

     

       32
       32
        
       

     

       33
       33
        
         hardeningDisable = [ "format" ]; # no build output otherwise

+1 -4

pkgs/desktops/gnustep/make/default.nix

···

       17
       17
        
         configureFlags = [

     

       18
       18
        
           "--with-layout=fhs-system"

     

       19
       19
        
           "--disable-install-p"

     

       20
       20
       +
           "--with-config-file=${placeholder "out"}/etc/GNUstep/GNUstep.conf"

     

       20
       21
        
         ];

     

       21
       21
       -
       

     

       22
       22
       -
         preConfigure = ''

     

       23
       23
       -
           configureFlags="$configureFlags --with-config-file=$out/etc/GNUstep/GNUstep.conf"

     

       24
       24
       -
         '';

     

       25
       22
        
       

     

       26
       23
        
         makeFlags = [

     

       27
       24
        
           "GNUSTEP_INSTALLATION_DOMAIN=SYSTEM"

+2 -2

pkgs/desktops/plasma-5/default.nix

···

       61
       61
        
                         postHooks+=("source @dev@/nix-support/setup-hook")

     

       62
       62
        
                     else

     

       63
       63
        
                         # Propagate $${out} output

     

       64
       64
       -
                         propagatedUserEnvPkgs+=" @${out}@"

     

       64
       64
       +
                         appendToVar propagatedUserEnvPkgs "@${out}@"

     

       65
       65
        
       

     

       66
       66
        
                         if [ -z "$outputDev" ]; then

     

       67
       67
        
                             echo "error: \$outputDev is unset!" >&2

     
···

       71
       71
        
                         # Propagate $dev so that this setup hook is propagated

     

       72
       72
        
                         # But only if there is a separate $dev output

     

       73
       73
        
                         if [ "$outputDev" != out ]; then

     

       74
       74
       -
                             propagatedBuildInputs+=" @dev@"

     

       74
       74
       +
                             appendToVar propagatedBuildInputs "@dev@"

     

       75
       75
        
                         fi

     

       76
       76
        
                     fi

     

       77
       77
        
                   '';

+1 -1

pkgs/development/compilers/gcc/common/builder.nix

···

       185
       185
        
               mkdir -p ../mingw

     

       186
       186
        
               # --with-build-sysroot expects that:

     

       187
       187
        
               cp -R $libcCross/include ../mingw

     

       188
       188
       -
               configureFlags="$configureFlags --with-build-sysroot=`pwd`/.."

     

       188
       188
       +
               appendToVar configureFlags "--with-build-sysroot=`pwd`/.."

     

       189
       189
        
           fi

     

       190
       190
        
       

     

       191
       191
        
           # Perform the build in a different directory.

+1 -1

pkgs/development/cuda-modules/setup-hooks/setup-cuda-hook.sh

···

       112
       112
        
           local propagatedBuildInputs=( "${!cudaHostPathsSeen[@]}" )

     

       113
       113
        
           for output in $(getAllOutputNames) ; do

     

       114
       114
        
               if [[ ! "$output" = "$cudaPropagateToOutput" ]] ; then

     

       115
       115
       -
                   propagatedBuildInputs+=( "${!output}" )

     

       115
       115
       +
                   appendToVar propagatedBuildInputs "${!output}"

     

       116
       116
        
               fi

     

       117
       117
        
               break

     

       118
       118
        
           done

+1 -1

pkgs/development/haskell-modules/configuration-nix.nix

···

       255
       255
        
         jni = overrideCabal (drv: {

     

       256
       256
        
           preConfigure = ''

     

       257
       257
        
             local libdir=( "${pkgs.jdk}/lib/openjdk/jre/lib/"*"/server" )

     

       258
       258
       -
             configureFlags+=" --extra-lib-dir=''${libdir[0]}"

     

       258
       258
       +
             appendToVar configureFlags "--extra-lib-dir=''${libdir[0]}"

     

       259
       259
        
           '';

     

       260
       260
        
         }) super.jni;

     

       261
       261

+3 -3

pkgs/development/haskell-modules/generic-builder.nix

···

       478
       478
        
           for p in "''${pkgsHostHost[@]}" "''${pkgsHostTarget[@]}"; do

     

       479
       479
        
             ${buildPkgDb ghc "$packageConfDir"}

     

       480
       480
        
             if [ -d "$p/include" ]; then

     

       481
       481
       -
               configureFlags+=" --extra-include-dirs=$p/include"

     

       481
       481
       +
               appendToVar configureFlags "--extra-include-dirs=$p/include"

     

       482
       482
        
             fi

     

       483
       483
        
             if [ -d "$p/lib" ]; then

     

       484
       484
       -
               configureFlags+=" --extra-lib-dirs=$p/lib"

     

       484
       484
       +
               appendToVar configureFlags "--extra-lib-dirs=$p/lib"

     

       485
       485
        
             fi

     

       486
       486
        
             if [[ -d "$p/Library/Frameworks" ]]; then

     

       487
       487
       -
               configureFlags+=" --extra-framework-dirs=$p/Library/Frameworks"

     

       487
       487
       +
               appendToVar configureFlags "--extra-framework-dirs=$p/Library/Frameworks"

     

       488
       488
        
             fi

     

       489
       489
        
         '' + ''

     

       490
       490
        
           done

+1 -1

pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook-tests.nix

···

       83
       83
        
           generatePythonPackage {

     

       84
       84
        
             pname = "cyclic-dependencies";

     

       85
       85
        
             preFixup = ''

     

       86
       86
       -
               propagatedBuildInputs+=("$out")

     

       86
       86
       +
               appendToVar propagatedBuildInputs "$out"

     

       87
       87
        
             '';

     

       88
       88
        
           };

     

       89
       89

+5 -6

pkgs/development/libraries/glibc/common.nix

···

       224
       224
        
           inherit sha256;

     

       225
       225
        
         };

     

       226
       226
        
       

     

       227
       227
       +
         makeFlags = lib.optionals (stdenv.cc.libc != null) [

     

       228
       228
       +
           "BUILD_LDFLAGS=-Wl,-rpath,${stdenv.cc.libc}/lib"

     

       229
       229
       +
           "OBJDUMP=${stdenv.cc.bintools.bintools}/bin/objdump"

     

       230
       230
       +
         ];

     

       231
       231
       +
       

     

       227
       232
        
         # Remove absolute paths from `configure' & co.; build out-of-tree.

     

       228
       233
        
         preConfigure = ''

     

       229
       234
        
           export PWD_P=$(type -tP pwd)

     
···

       237
       242
        
           cd ../build

     

       238
       243
        
       

     

       239
       244
        
           configureScript="`pwd`/../$sourceRoot/configure"

     

       240
       240
       -
       

     

       241
       241
       -
           ${lib.optionalString (stdenv.cc.libc != null)

     

       242
       242
       -
             ''makeFlags="$makeFlags BUILD_LDFLAGS=-Wl,-rpath,${stdenv.cc.libc}/lib OBJDUMP=${stdenv.cc.bintools.bintools}/bin/objdump"''

     

       243
       243
       -
           }

     

       244
       244
       -
       

     

       245
       245
       -
       

     

       246
       245
        
         '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''

     

       247
       246
        
           sed -i s/-lgcc_eh//g "../$sourceRoot/Makeconfig"

     

       248
       247

+2 -2

pkgs/development/libraries/grantlee/5/setup-hook.sh

···

       6
       6
        
       

     

       7
       7
        
       _grantleeEnvHook() {

     

       8
       8
        
           if providesGrantleeRuntime "$1"; then

     

       9
       9
       -
               propagatedBuildInputs+=" $1"

     

       10
       10
       -
               propagatedUserEnvPkgs+=" $1"

     

       9
       9
       +
               appendToVar propagatedBuildInputs "$1"

     

       10
       10
       +
               appendToVar propagatedUserEnvPkgs "$1"

     

       11
       11
        
           fi

     

       12
       12
        
       }

     

       13
       13
        
       addEnvHooks "$hostOffset" _grantleeEnvHook

+1 -1

pkgs/development/libraries/kde-frameworks/default.nix

···

       52
       52
        
                           # Propagate $dev so that this setup hook is propagated

     

       53
       53
        
                           # But only if there is a separate $dev output

     

       54
       54
        
                           if [ "''${outputDev:?}" != out ]; then

     

       55
       55
       -
                               propagatedBuildInputs="''${propagatedBuildInputs-} @dev@"

     

       55
       55
       +
                               appendToVar propagatedBuildInputs "@dev@"

     

       56
       56
        
                           fi

     

       57
       57
        
                       fi

     

       58
       58
        
                     '';

+1 -1

pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh

···

       111
       111
        
       

     

       112
       112
        
           if [ -d "$1/dbus-1" ]

     

       113
       113
        
           then

     

       114
       114
       -
               propagatedUserEnvPkgs+=" $1"

     

       114
       114
       +
               appendToVar propagatedUserEnvPkgs "$1"

     

       115
       115
        
           fi

     

       116
       116
        
       }

     

       117
       117
        
       addEnvHooks "$targetOffset" ecmHostPathHook

+3 -3

pkgs/development/libraries/phonon/default.nix

···

       62
       62
        
         dontWrapQtApps = true;

     

       63
       63
        
       

     

       64
       64
        
         preConfigure = ''

     

       65
       65
       -
           cmakeFlags+=" -DPHONON_QT_MKSPECS_INSTALL_DIR=''${!outputDev}/mkspecs"

     

       66
       66
       -
           cmakeFlags+=" -DPHONON_QT_IMPORTS_INSTALL_DIR=''${!outputBin}/$qtQmlPrefix"

     

       67
       67
       -
           cmakeFlags+=" -DPHONON_QT_PLUGIN_INSTALL_DIR=''${!outputBin}/$qtPluginPrefix/designer"

     

       65
       65
       +
           appendToVar cmakeFlags "-DPHONON_QT_MKSPECS_INSTALL_DIR=''${!outputDev}/mkspecs"

     

       66
       66
       +
           appendToVar cmakeFlags "-DPHONON_QT_IMPORTS_INSTALL_DIR=''${!outputBin}/$qtQmlPrefix"

     

       67
       67
       +
           appendToVar cmakeFlags "-DPHONON_QT_PLUGIN_INSTALL_DIR=''${!outputBin}/$qtPluginPrefix/designer"

     

       68
       68
        
         '';

     

       69
       69
        
       

     

       70
       70
        
         postPatch = ''

+1 -1

pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh

···

       72
       72
        
           qtEnvHostTargetSeen[$1]=1

     

       73
       73
        
           if providesQtRuntime "$1" && [ "z${!outputBin}" != "z${!outputDev}" ]

     

       74
       74
        
           then

     

       75
       75
       -
               propagatedBuildInputs+=" $1"

     

       75
       75
       +
               appendToVar propagatedBuildInputs "$1"

     

       76
       76
        
           fi

     

       77
       77
        
       }

     

       78
       78
        
       envHostTargetHooks+=(qtEnvHostTargetHook)

+1 -1

pkgs/development/python-modules/numpy/1.nix

···

       126
       126
        
       

     

       127
       127
        
         # HACK: copy mesonEmulatorHook's flags to the variable used by meson-python

     

       128
       128
        
         postConfigure = ''

     

       129
       129
       -
           mesonFlags="$mesonFlags ''${mesonFlagsArray[@]}"

     

       129
       129
       +
           concatTo mesonFlags mesonFlagsArray

     

       130
       130
        
         '';

     

       131
       131
        
       

     

       132
       132
        
         preBuild = ''

+1 -1

pkgs/development/python-modules/numpy/2.nix

···

       103
       103
        
       

     

       104
       104
        
         # HACK: copy mesonEmulatorHook's flags to the variable used by meson-python

     

       105
       105
        
         postConfigure = ''

     

       106
       106
       -
           mesonFlags="$mesonFlags ''${mesonFlagsArray[@]}"

     

       106
       106
       +
           concatTo mesonFlags mesonFlagsArray

     

       107
       107
        
         '';

     

       108
       108
        
       

     

       109
       109
        
         buildInputs = [

+1 -1

pkgs/development/tools/analysis/rr/zen_workaround.nix

···

       17
       17
        
           "-C${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"

     

       18
       18
        
         ];

     

       19
       19
        
         postConfigure = ''

     

       20
       20
       -
           makeFlags="$makeFlags M=$(pwd)"

     

       20
       20
       +
           appendToVar makeFlags "M=$(pwd)"

     

       21
       21
        
         '';

     

       22
       22
        
         buildFlags = [ "modules" ];

     

       23
       23

+4 -1

pkgs/development/tools/analysis/sparse/default.nix

···

       14
       14
        
         preConfigure = ''

     

       15
       15
        
           sed -i 's|"/usr/include"|"${stdenv.cc.libc.dev}/include"|' pre-process.c

     

       16
       16
        
           sed -i 's|qx(\$ccom -print-file-name=)|"${GCC_BASE}"|' cgcc

     

       17
       17
       -
           makeFlags+=" PREFIX=$out"

     

       18
       17
        
         '';

     

       18
       18
       +
       

     

       19
       19
       +
         makeFlags = [

     

       20
       20
       +
           "PREFIX=${placeholder "out"}"

     

       21
       21
       +
         ];

     

       19
       22
        
       

     

       20
       23
        
         nativeBuildInputs = [ pkg-config ];

     

       21
       24
        
         buildInputs = [ gtk3 libxml2 llvm perl sqlite ];

+2 -2

pkgs/development/tools/misc/luarocks/default.nix

···

       50
       50
        
           lua -e "" || {

     

       51
       51
        
               luajit -e "" && {

     

       52
       52
        
                   export LUA_SUFFIX=jit

     

       53
       53
       -
                   configureFlags="$configureFlags --lua-suffix=$LUA_SUFFIX"

     

       53
       53
       +
                   appendToVar configureFlags "--lua-suffix=$LUA_SUFFIX"

     

       54
       54
        
               }

     

       55
       55
        
           }

     

       56
       56
        
           lua_inc="$(echo "${lua}/include"/*/)"

     

       57
       57
        
           if test -n "$lua_inc"; then

     

       58
       58
       -
               configureFlags="$configureFlags --with-lua-include=$lua_inc"

     

       58
       58
       +
               appendToVar configureFlags "--with-lua-include=$lua_inc"

     

       59
       59
        
           fi

     

       60
       60
        
         '';

     

       61
       61

+1 -1

pkgs/kde/frameworks/extra-cmake-modules/ecm-hook.sh

···

       107
       107
        
       

     

       108
       108
        
           if [ -d "$1/share/dbus-1" ]

     

       109
       109
        
           then

     

       110
       110
       -
               propagatedUserEnvPkgs+=" $1"

     

       110
       110
       +
               appendToVar propagatedUserEnvPkgs "$1"

     

       111
       111
        
           fi

     

       112
       112
        
       }

     

       113
       113
        
       addEnvHooks "$hostOffset" ecmHostPathHook

+1 -1

pkgs/os-specific/bsd/freebsd/pkgs/bin.nix

···

       81
       81
        
         '';

     

       82
       82
        
       

     

       83
       83
        
         preInstall = ''

     

       84
       84
       -
           makeFlags="$makeFlags ROOTDIR=$out/root"

     

       84
       84
       +
           appendToVar makeFlags "ROOTDIR=$out/root"

     

       85
       85
        
         '';

     

       86
       86
        
       

     

       87
       87
        
         outputs = [

+4 -4

pkgs/servers/nosql/mongodb/mongodb.nix

···

       136
       136
        
         hardeningDisable = [ "fortify3" ];

     

       137
       137
        
       

     

       138
       138
        
         preBuild = ''

     

       139
       139
       -
           sconsFlags+=" CC=$CC"

     

       140
       140
       -
           sconsFlags+=" CXX=$CXX"

     

       139
       139
       +
           appendToVar sconsFlags "CC=$CC"

     

       140
       140
       +
           appendToVar sconsFlags "CXX=$CXX"

     

       141
       141
        
         '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''

     

       142
       142
       -
           sconsFlags+=" AR=$AR"

     

       142
       142
       +
           appendToVar sconsFlags "AR=$AR"

     

       143
       143
        
         '' + lib.optionalString stdenv.hostPlatform.isAarch64 ''

     

       144
       144
       -
           sconsFlags+=" CCFLAGS='-march=armv8-a+crc'"

     

       144
       144
       +
           appendToVar sconsFlags "CCFLAGS=-march=armv8-a+crc"

     

       145
       145
        
         '';

     

       146
       146
        
       

     

       147
       147
        
         preInstall = ''

+2 -2

pkgs/servers/x11/xorg/builder.sh

···

       21
       21
        
               for p in "${pkgsHostHost[@]}" "${pkgsHostTarget[@]}"; do

     

       22
       22
        
                   if test -e $p/lib/pkgconfig/$r.pc; then

     

       23
       23
        
                       echo "  found requisite $r in $p"

     

       24
       24
       -
                       propagatedBuildInputs+=" $p"

     

       24
       24
       +
                       appendToVar propagatedBuildInputs "$p"

     

       25
       25
        
                   fi

     

       26
       26
        
               done

     

       27
       27
        
           done

     

       28
       28
        
       }

     

       29
       29
        
       

     

       30
       30
        
       

     

       31
       31
       -
       installFlags="appdefaultdir=$out/share/X11/app-defaults $installFlags"

     

       31
       31
       +
       prependToVar installFlags "appdefaultdir=$out/share/X11/app-defaults"

     

       32
       32
        
       

     

       33
       33
        
       

     

       34
       34
        
       if test -n "$x11BuildHook"; then

+1 -1

pkgs/tools/typesetting/tex/nix/run-latex.sh

···

       99
       99
        
       if test -f $rootNameBase.idx; then

     

       100
       100
        
           echo "MAKING INDEX..."

     

       101
       101
        
           if test -n "$compressBlanksInIndex"; then

     

       102
       102
       -
               makeindexFlags="$makeindexFlags -c"

     

       102
       102
       +
               appendToVar makeindexFlags "-c"

     

       103
       103
        
           fi

     

       104
       104
        
           makeindex $makeindexFlags $rootNameBase.idx

     

       105
       105
        
           runNeeded=1