Unverified Commit e207d1f0 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge older staging 

There's a security fix for curl.
parents 66ce84b6 3be89a67

pkgs/applications/audio/audio-recorder/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -34,9 +34,9 @@ stdenv.mkDerivation rec { 
  '';



  preFixup = ''

    gappsWrapperArgs+=('--prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"'

      '--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"'

      '--prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules"')

    gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : $out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH

      --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : $GST_PLUGIN_SYSTEM_PATH_1_0

      --prefix GIO_EXTRA_MODULES : ${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules)

  '';



  meta = with stdenv.lib; {

pkgs/applications/audio/clerk/default.nix

+2 −4
Original line number Diff line number Diff line
@@ -13,13 +13,11 @@ stdenv.mkDerivation { 


  buildInputs = [ makeWrapper pythonPackages.mpd2 ];



  buildPhase = ''

    echo skipping build phase...

  '';

  dontBuild = true;



  installPhase = ''

    DESTDIR=$out PREFIX=/ make install

    wrapProgram $out/bin/clerk $out/bin/clerk \

    wrapProgram $out/bin/clerk \

      --prefix PATH : "${stdenv.lib.makeBinPath [ rofi mpc_cli perl utillinux libnotify ]}"

  '';

pkgs/applications/misc/gnuradio/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec { 
  postInstall = ''

    printf "backend : Qt4Agg\n" > "$out/share/gnuradio/matplotlibrc"



    for file in "$out"/bin/* "$out"/share/gnuradio/examples/*/*.py; do

    for file in $(find $out/bin $out/share/gnuradio/examples -type f -executable); do

        wrapProgram "$file" \

            --prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath "$out") \

            --set MATPLOTLIBRC "$out/share/gnuradio"

pkgs/applications/misc/gnuradio/wrapper.nix

+2 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ stdenv.mkDerivation { 
    mkdir -p $out/bin

    ln -s "${gnuradio}"/bin/* $out/bin/



    for file in "$out"/bin/*; do

    for file in $(find $out/bin -type f -executable); do

        wrapProgram "$file" \

            --prefix PYTHONPATH : ${stdenv.lib.concatStringsSep ":"

                                     (map (path: "$(toPythonPath ${path})") extraPackages)} \

pkgs/applications/office/libreoffice/still.nix

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ in stdenv.mkDerivation rec { 


    mkdir -p "$out/share/gsettings-schemas/collected-for-libreoffice/glib-2.0/schemas/"



    for a in sbase scalc sdraw smath swriter spadmin simpress soffice; do

    for a in sbase scalc sdraw smath swriter simpress soffice; do

      ln -s $out/lib/libreoffice/program/$a $out/bin/$a

      wrapProgram "$out/bin/$a" \

         --prefix XDG_DATA_DIRS : \