diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-07-03 09:48:58 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-07-03 09:48:58 +0200 |
| commit | d1a89ae9d702a4b91b6d661af256552e330bb995 (patch) | |
| tree | b34b95d1204ad7b4423b10cf1572d11b3293319f /pkgs/os-specific | |
| parent | 343ad1697d6967b7aa949752fd5c4471f691b4eb (diff) | |
| parent | 0b1c8793fc20944b68562d9a73a5ce391f1603e0 (diff) | |
| download | nixlib-d1a89ae9d702a4b91b6d661af256552e330bb995.tar nixlib-d1a89ae9d702a4b91b6d661af256552e330bb995.tar.gz nixlib-d1a89ae9d702a4b91b6d661af256552e330bb995.tar.bz2 nixlib-d1a89ae9d702a4b91b6d661af256552e330bb995.tar.lz nixlib-d1a89ae9d702a4b91b6d661af256552e330bb995.tar.xz nixlib-d1a89ae9d702a4b91b6d661af256552e330bb995.tar.zst nixlib-d1a89ae9d702a4b91b6d661af256552e330bb995.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/firejail/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kbdlight/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kmod-debian-aliases/default.nix | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index cf7fe8fc8418..1bbe8dbb160b 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { ''; preBuild = '' - sed -e "s@/etc/@$out/etc/@g" -i Makefile + sed -e "s@/etc/@$out/etc/@g" -e "/chmod u+s/d" -i Makefile ''; meta = { diff --git a/pkgs/os-specific/linux/kbdlight/default.nix b/pkgs/os-specific/linux/kbdlight/default.nix index 1bc07f357a8a..44a63c9f1ece 100644 --- a/pkgs/os-specific/linux/kbdlight/default.nix +++ b/pkgs/os-specific/linux/kbdlight/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { preConfigure = '' substituteInPlace Makefile \ - --replace /usr/local $out + --replace /usr/local $out \ + --replace 4755 0755 ''; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/kmod-debian-aliases/default.nix b/pkgs/os-specific/linux/kmod-debian-aliases/default.nix index eac3fb920015..a7b6561239d0 100644 --- a/pkgs/os-specific/linux/kmod-debian-aliases/default.nix +++ b/pkgs/os-specific/linux/kmod-debian-aliases/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "22-1.1"; src = fetchurl { - url = "mirror://debian/pool/main/k/kmod/kmod_${version}.debian.tar.xz"; + url = "http://snapshot.debian.org/archive/debian/20160404T220610Z/pool/main/k/kmod/kmod_${version}.debian.tar.xz"; sha256 = "0daap2n4bvjqcnksaayy6csmdb1px4r02w3xp36bcp6w3lbnqamh"; }; |