summary refs log tree commit diff
path: root/pkgs/development/libraries/libsoup/default.nix
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2018-08-21 15:36:02 +0200
committerVladimír Čunát <vcunat@gmail.com>2018-08-21 15:36:02 +0200
commit765d695b89fac76f84b1ff9a1a7737753b2d8530 (patch)
treec130c7dc4d7d05e0bcea14be12b7a9dcef2cc642 /pkgs/development/libraries/libsoup/default.nix
parent690a8017de9f9e9bed8609c1798d6d4309d9794a (diff)
parentcad8fc3447372043c4a098a3104a03f4990058e4 (diff)
downloadnixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar
nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.gz
nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.bz2
nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.lz
nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.xz
nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.zst
nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.zip
Merge branch 'staging-next'
Security fixes for a few packages are included.
Diffstat (limited to 'pkgs/development/libraries/libsoup/default.nix')
-rw-r--r--pkgs/development/libraries/libsoup/default.nix11
1 files changed, 4 insertions, 7 deletions
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index f9ea73089f4c..2804486e2f0a 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -3,22 +3,19 @@
 , valaSupport ? true, vala_0_40
 , intltool, python3 }:
 
-let
-  pname = "libsoup";
-  version = "2.62.2";
-in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
+  pname = "libsoup";
+  version = "2.62.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
     sha256 = "1dkrz1iwsswscayfmjxqv2q00b87snlq9nxdccn5vck0vbinylwy";
   };
 
-  prePatch = ''
+  postPatch = ''
     patchShebangs libsoup/
-  '' + stdenv.lib.optionalString valaSupport
-  ''
+  '' + stdenv.lib.optionalString valaSupport ''
      substituteInPlace libsoup/Makefile.in --replace "\$(DESTDIR)\$(vapidir)" "\$(DESTDIR)\$(girdir)/../vala/vapi"
   '';